fixes for email activity

github issues