Ensuring the encryption of mail/sms passwords, unfortunately by brutal hack for now (MID-1781).
Merge remote-tracking branch 'origin/master'