Merge proposals dependent on lp:~davidagraf/zorba/email-module-fixes

lp:~davidagraf/zorba/email-module-fixes has no merge proposals.