fixed #36 #34 + saving sender's email address