mailbox imap server error fix
merge and other changes
translation, mail issue fix
Merge branch 'PatelUtkarsh-develop' into develop