diff -Nru geary-0.12.4/debian/changelog geary-0.12.4/debian/changelog
--- geary-0.12.4/debian/changelog	2018-09-15 15:03:58.000000000 +0000
+++ geary-0.12.4/debian/changelog	2018-12-24 17:07:05.000000000 +0000
@@ -1,3 +1,17 @@
+geary (0.12.4-4) unstable; urgency=medium
+
+  * Cherry-pick Actually-use-error-variable.patch:
+    - Fix build with latest vala
+
+ -- Jeremy Bicha <jbicha@debian.org>  Mon, 24 Dec 2018 12:07:05 -0500
+
+geary (0.12.4-3) unstable; urgency=medium
+
+  * Add -Wl,-O1 to our LDFLAGS
+  * Bump Standards-Version to 4.3.0
+
+ -- Jeremy Bicha <jbicha@debian.org>  Mon, 24 Dec 2018 09:19:50 -0500
+
 geary (0.12.4-2) unstable; urgency=medium
 
   * Cherry-pick 3 patches to fix build with webkit2gtk 2.22
diff -Nru geary-0.12.4/debian/control geary-0.12.4/debian/control
--- geary-0.12.4/debian/control	2018-09-15 15:03:58.000000000 +0000
+++ geary-0.12.4/debian/control	2018-12-24 17:07:05.000000000 +0000
@@ -29,7 +29,7 @@
                libwebkit2gtk-4.0-dev (>= 2.22),
                libxml2-dev (>= 2.7.8),
                valac (>= 0.22.1)
-Standards-Version: 4.2.1
+Standards-Version: 4.3.0
 X-Ubuntu-Use-Langpack: yes
 Homepage: https://wiki.gnome.org/Apps/Geary
 Vcs-Git: https://salsa.debian.org/gnome-team/geary.git
diff -Nru geary-0.12.4/debian/control.in geary-0.12.4/debian/control.in
--- geary-0.12.4/debian/control.in	2018-09-15 15:03:58.000000000 +0000
+++ geary-0.12.4/debian/control.in	2018-12-24 17:07:05.000000000 +0000
@@ -25,7 +25,7 @@
                libwebkit2gtk-4.0-dev (>= 2.22),
                libxml2-dev (>= 2.7.8),
                valac (>= 0.22.1)
-Standards-Version: 4.2.1
+Standards-Version: 4.3.0
 X-Ubuntu-Use-Langpack: yes
 Homepage: https://wiki.gnome.org/Apps/Geary
 Vcs-Git: https://salsa.debian.org/gnome-team/geary.git
diff -Nru geary-0.12.4/debian/patches/Actually-use-error-variable.patch geary-0.12.4/debian/patches/Actually-use-error-variable.patch
--- geary-0.12.4/debian/patches/Actually-use-error-variable.patch	1970-01-01 00:00:00.000000000 +0000
+++ geary-0.12.4/debian/patches/Actually-use-error-variable.patch	2018-12-24 17:07:05.000000000 +0000
@@ -0,0 +1,21 @@
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Tue, 27 Nov 2018 14:53:56 +0100
+Subject: Actually use error variable to check for IOError.CANCELLED
+
+---
+ src/client/application/geary-controller.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/client/application/geary-controller.vala b/src/client/application/geary-controller.vala
+index d73afa3..f9a4565 100644
+--- a/src/client/application/geary-controller.vala
++++ b/src/client/application/geary-controller.vala
+@@ -2522,7 +2522,7 @@ public class GearyController : Geary.BaseObject {
+             yield do_empty_folder_async(emptyable, cancellable);
+         } catch (Error err) {
+             // don't report to user if cancelled
+-            if (cancellable is IOError.CANCELLED)
++            if (err is IOError.CANCELLED)
+                 return;
+             
+             ErrorDialog dialog = new ErrorDialog(main_window,
diff -Nru geary-0.12.4/debian/patches/series geary-0.12.4/debian/patches/series
--- geary-0.12.4/debian/patches/series	2018-09-15 15:03:58.000000000 +0000
+++ geary-0.12.4/debian/patches/series	2018-12-24 17:07:05.000000000 +0000
@@ -1,3 +1,4 @@
 bindings-Drop-custom-javascriptcore-4.0-and-webkit2gtk-4..patch
 Adjust-to-upstream-javascriptcore-4.0-bindings.patch
 Clean-up-JS-util-API-courtesy-the-new-bindings.patch
+Actually-use-error-variable.patch
diff -Nru geary-0.12.4/debian/rules geary-0.12.4/debian/rules
--- geary-0.12.4/debian/rules	2018-09-15 15:03:58.000000000 +0000
+++ geary-0.12.4/debian/rules	2018-12-24 17:07:05.000000000 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,--as-needed
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,-z,defs -Wl,--as-needed
 
 %:
 	dh $@ --buildsystem=cmake --with gnome