refact sender to mail