diff -Nru sylpheed-3.5.1/debian/changelog sylpheed-3.5.1/debian/changelog
--- sylpheed-3.5.1/debian/changelog
+++ sylpheed-3.5.1/debian/changelog
@@ -1,3 +1,10 @@
+sylpheed (3.5.1-1ubuntu3.18.04.1) bionic; urgency=medium
+
+  * Add patch 0009-support-SNI-for-IMAP.patch to set SNI until available
+    in new upstream release. (LP: #1799345)
+
+ -- vofka <email@hidden>  Sat, 28 Sep 2019 09:53:15 +0000
+
 sylpheed (3.5.1-1ubuntu3) bionic; urgency=high
 
   * No change rebuild against openssl1.1.
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
+++ sylpheed-3.5.1/debian/patches/0009-support-SNI-for-IMAP.patch
@@ -0,0 +1,20 @@
+Description: Support SNI, some servers (imap.gmail.com) seem to require it.
+Bug: https://sylpheed.sraoss.jp/redmine/issues/306
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/sylpheed/+bug/1799345
+Author: Antonio Ospite <ao2@ao2.it>
+Last-Update: 2019-09-28
+Index: sylpheed-3.5.1/libsylph/ssl.c
+===================================================================
+--- sylpheed-3.5.1.orig/libsylph/ssl.c
++++ sylpheed-3.5.1/libsylph/ssl.c
+@@ -257,6 +257,10 @@ gboolean ssl_init_socket_with_method(SockInfo *sockinfo, SSLMethod method)
+ 		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
+++ sylpheed-3.5.1/debian/patches/series
@@ -4,5 +4,6 @@
 04address_book.diff
 05sensible_editor.diff
 07escape_from_at_the_beginning.diff
+0009-support-SNI-for-IMAP.patch
 10use-panel-icon.patch
 11use-theme-icon-for-win.patch