#48, fix email senders