* Merged fix for 87412 from trunk, along with the fix in tinymail 3755