Feature/email2.1 fixing

Wow! Nice cleanup :100: