fix push-mail (revert r10417, r10418, r10430, refs #2080, refs #2081)

git-svn-id: file:///var/svn/freetz/trunk@10466 149334a1-2f27-0410-a3b9-fc62619ac1e6