Few webmail fixes.

see #585