* commit 'ed58d8ed8a50cbd8c5e01c4e51bcbbe4341d1dfd': Fix bug 3112733 - Missing TLS encryption option in manual email account setup
* commit 'ed58d8ed8a50cbd8c5e01c4e51bcbbe4341d1dfd': Fix bug 3112733 - Missing TLS encryption option in manual email account setup