Committed again the trunk commit 6008, as tinymail has again