more fixes
Merge branch '1026-email_share_fixes' into staging