More modifications on leaving the email sender-address alone