Added send by selection and previous sender

Tested and working