diff -Nru sylpheed-3.5.1/debian/changelog sylpheed-3.5.1/debian/changelog
--- sylpheed-3.5.1/debian/changelog	2019-09-02 07:13:30.000000000 +0000
+++ sylpheed-3.5.1/debian/changelog	2019-10-08 20:36:03.000000000 +0000
@@ -1,3 +1,9 @@
+sylpheed (3.5.1-1ubuntu5) eoan; urgency=medium
+
+  * d/p/0009-support-SNI-for-IMAP.patch: add SNI support (LP: #1799345)
+
+ -- Dan Streetman <ddstreet@canonical.com>  Tue, 08 Oct 2019 16:36:03 -0400
+
 sylpheed (3.5.1-1ubuntu4) eoan; urgency=medium
 
   * Drop build-dependency on obsolete libpisock-dev.
diff -Nru sylpheed-3.5.1/debian/patches/0009-support-SNI-for-IMAP.patch sylpheed-3.5.1/debian/patches/0009-support-SNI-for-IMAP.patch
--- sylpheed-3.5.1/debian/patches/0009-support-SNI-for-IMAP.patch	1970-01-01 00:00:00.000000000 +0000
+++ sylpheed-3.5.1/debian/patches/0009-support-SNI-for-IMAP.patch	2019-10-08 20:35:24.000000000 +0000
@@ -0,0 +1,24 @@
+From: Antonio Ospite <ao2@ao2.it>
+Date: Fri, 24 Aug 2018 10:46:04 +0200
+Subject: [PATCH v2] libsylph/ssl.c: Support SNI, some servers (imap.gmail.com)
+ seem to require it
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908063
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/sylpheed/+bug/1799345
+
+---
+ libsylph/ssl.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/libsylph/ssl.c
++++ b/libsylph/ssl.c
+@@ -257,6 +257,10 @@
+ 		return FALSE;
+ 	}
+ 
++#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
++	SSL_set_tlsext_host_name(sockinfo->ssl, sockinfo->hostname);
++#endif
++
+ 	SSL_set_fd(sockinfo->ssl, sockinfo->sock);
+ 	while ((ret = SSL_connect(sockinfo->ssl)) != 1) {
+ 		err = SSL_get_error(sockinfo->ssl, ret);
diff -Nru sylpheed-3.5.1/debian/patches/series sylpheed-3.5.1/debian/patches/series
--- sylpheed-3.5.1/debian/patches/series	2016-12-19 03:27:47.000000000 +0000
+++ sylpheed-3.5.1/debian/patches/series	2019-10-08 20:34:31.000000000 +0000
@@ -6,3 +6,4 @@
 07escape_from_at_the_beginning.diff
 10use-panel-icon.patch
 11use-theme-icon-for-win.patch
+0009-support-SNI-for-IMAP.patch