diff -Nru geary-3.32.0/debian/changelog geary-3.32.0/debian/changelog
--- geary-3.32.0/debian/changelog	2019-03-17 14:03:17.000000000 +0000
+++ geary-3.32.0/debian/changelog	2019-09-19 14:22:54.000000000 +0000
@@ -1,3 +1,13 @@
+geary (3.32.0-1ubuntu1) eoan; urgency=medium
+
+  * debian/patches/git_new_webkit.patch:
+    - backport a patch to fix issues with the new webkitgtk version
+  * debian/rules:
+    - skip tests on s390x, webkitgtk is buggy there
+      (lp: #1843524)
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Thu, 19 Sep 2019 15:28:17 +0200
+
 geary (3.32.0-1) experimental; urgency=medium
 
   * New upstream release
diff -Nru geary-3.32.0/debian/patches/git_new_webkit.patch geary-3.32.0/debian/patches/git_new_webkit.patch
--- geary-3.32.0/debian/patches/git_new_webkit.patch	1970-01-01 00:00:00.000000000 +0000
+++ geary-3.32.0/debian/patches/git_new_webkit.patch	2019-09-19 14:13:35.000000000 +0000
@@ -0,0 +1,63 @@
+From a268b05d35eeef934e0dad66fe308a6230efc469 Mon Sep 17 00:00:00 2001
+From: Michael Gratton <mike@vee.net>
+Date: Sat, 7 Sep 2019 10:31:39 +1000
+Subject: [PATCH 1/2] Disable WebKitGTK hardware accelleration using API, not
+ env var
+
+Stop setting the olde WEBKIT_DISABLE_COMPOSITING_MODE envrionment
+variable, use the API instead.
+---
+ src/client/application/main.vala           | 9 ---------
+ src/client/components/client-web-view.vala | 2 ++
+ 2 files changed, 2 insertions(+), 9 deletions(-)
+
+Index: geary-3.32.0/src/client/application/main.vala
+===================================================================
+--- geary-3.32.0.orig/src/client/application/main.vala
++++ geary-3.32.0/src/client/application/main.vala
+@@ -20,13 +20,10 @@ int main(string[] args) {
+     Environment.set_variable("G_TLS_GNUTLS_PRIORITY", "NORMAL:%COMPAT:!VERS-SSL3.0", false);
+ #endif
+ 
+-    // Disable WebKit2 accelerated compositing here while we can't
+-    // depend on there being an API to do it. AC isn't appropriate
+-    // since Geary is likely to be doing anything that requires
+-    // acceleration, and it is costs a lot in terms of performance
+-    // and memory:
+-    // https://lists.webkit.org/pipermail/webkit-gtk/2016-November/002863.html
+-    Environment.set_variable("WEBKIT_DISABLE_COMPOSITING_MODE", "1", true);
++    // Temporary workaround for WebKitGTK deprecation of the
++    // shared-secondary process model. Pull this out in 3.36 when the
++    // proper fix lands. See GNOME/geary#558.
++    Environment.set_variable("WEBKIT_USE_SINGLE_WEB_PROCESS", "1", true);
+ 
+     GearyApplication app = new GearyApplication();
+ 
+@@ -38,4 +35,3 @@ int main(string[] args) {
+ 
+     return ec;
+ }
+-
+Index: geary-3.32.0/src/client/components/client-web-view.vala
+===================================================================
+--- geary-3.32.0.orig/src/client/components/client-web-view.vala
++++ geary-3.32.0/src/client/components/client-web-view.vala
+@@ -77,9 +77,6 @@ public abstract class ClientWebView : We
+                                         bool enable_logging) {
+         WebsiteDataManager data_manager = new WebsiteDataManager(cache_dir.get_path());
+         WebKit.WebContext context = new WebKit.WebContext.with_website_data_manager(data_manager);
+-        // Use a shared process so we don't spawn N WebProcess instances
+-        // when showing N messages in a conversation.
+-        context.set_process_model(WebKit.ProcessModel.SHARED_SECONDARY_PROCESS);
+         // Use the doc viewer model since each web view instance only
+         // ever shows a single HTML document.
+         context.set_cache_model(WebKit.CacheModel.DOCUMENT_VIEWER);
+@@ -310,6 +307,8 @@ public abstract class ClientWebView : We
+         setts.enable_offline_web_application_cache = false;
+         setts.enable_page_cache = false;
+         setts.enable_plugins = false;
++        setts.hardware_acceleration_policy =
++            WebKit.HardwareAccelerationPolicy.NEVER;
+         setts.javascript_can_access_clipboard = true;
+ 
+         WebKit.UserContentManager content_manager =
diff -Nru geary-3.32.0/debian/patches/series geary-3.32.0/debian/patches/series
--- geary-3.32.0/debian/patches/series	2019-03-17 14:03:17.000000000 +0000
+++ geary-3.32.0/debian/patches/series	2019-09-19 14:10:33.000000000 +0000
@@ -0,0 +1 @@
+git_new_webkit.patch
diff -Nru geary-3.32.0/debian/rules geary-3.32.0/debian/rules
--- geary-3.32.0/debian/rules	2019-03-17 14:03:17.000000000 +0000
+++ geary-3.32.0/debian/rules	2019-09-19 13:27:55.000000000 +0000
@@ -14,4 +14,9 @@
 	dh_auto_configure -- $(BUILD_UNWIND)
 
 override_dh_auto_test:
+ifeq (,$(filter s390x,$(DEB_HOST_ARCH)))
 	xvfb-run -a dh_auto_test
+else
+	echo 'webkit is buggy on s390x (lp: #1843524)'
+endif
+