diff --git a/files/utfmismatch-rfc822string.patch b/files/utfmismatch-rfc822string.patch
new file mode 100644
--- /dev/null
+++ b/files/utfmismatch-rfc822string.patch
@@ -0,0 +1,29 @@
+diff --git a/src/engine/rfc822/rfc822-mailbox-address.vala b/src/engine/rfc822/rfc822-mailbox-address.vala
+index 5ead3307..fb7d290a 100644
+--- a/src/engine/rfc822/rfc822-mailbox-address.vala
++++ b/src/engine/rfc822/rfc822-mailbox-address.vala
+@@ -131,7 +131,7 @@ public class Geary.RFC822.MailboxAddress :
+         while ((start = text.index_of("=?", offset)) != -1) {
+             // Find the closing marker.
+             int end = text.index_of("?=", start + 2) + 2;
+-            if (end == -1) {
++            if (end <= 1) {
+                 end = text.length;
+             }
+ 
+diff --git a/test/engine/rfc822-mailbox-address-test.vala b/test/engine/rfc822-mailbox-address-test.vala
+index 9aa2b9e7..7e4f6812 100644
+--- a/test/engine/rfc822-mailbox-address-test.vala
++++ b/test/engine/rfc822-mailbox-address-test.vala
+@@ -146,6 +146,11 @@ class Geary.RFC822.MailboxAddressTest : TestCase {
+             addr = new MailboxAddress.from_rfc822_string("\"=?utf-8?Q?=42=45=47=49=4E=20=2F=20=28=7C=29=7C=3C=7C=3E=7C=40=7C=2C=7C=3B=7C=3A=7C=5C=7C=22=7C=2F=7C=5B=7C=5D=7C=3F=7C=2E=7C=3D=20=2F=20=00=20=50=41=53=53=45=44=20=4E=55=4C=4C=20=42=59=54=45=20=2F=20=0D=0A=20=50=41=53=53=45=44=20=43=52=4C=46=20=2F=20?==?utf-8?b?RU5E=?=\"");
+             assert(addr.name == null);
+             assert(addr.address == "BEGIN / (|)|<|>|@|,|;|:|\\|\"|/|[|]|?|.|= / ? PASSED NULL BYTE / \r\n PASSED CRLF / END");
++
++            addr = new MailboxAddress.from_rfc822_string("=?UTF-8?Q?=22Firstname_=22=C2=AF\\=5F=28=E3=83=84=29=5F/=C2=AF=22_Lastname_via?==?UTF-8?Q?_Vendor=22_<system@vendor.com>?=");
++            assert(addr.name == "Firstname ¯_(ツ)_/¯ Lastname via=?UTF-8?Q?_Vendor=22_");
++            assert(addr.mailbox == "system");
++            assert(addr.domain == "vendor.com");
+         } catch (Error err) {
+             assert_not_reached();
+         }
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
 name       : geary
 version    : 3.32.1
-release    : 23
+release    : 24
 source     :
     - https://download.gnome.org/sources/geary/3.32/geary-3.32.1.tar.xz : eedc6f2d40e8131fa08990ffda1b77a53a153b77070c84f26dcf1dbb4a8cc51f
 license    :
@@ -30,6 +30,7 @@
 rundeps    :
     - gnome-keyring
 setup      : |
+    %patch -p1 < $pkgfiles/utfmismatch-rfc822string.patch
     %meson_configure
 build      : |
     %ninja_build
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
     <Source>
         <Name>geary</Name>
         <Packager>
-            <Name>Joshua Strobl</Name>
-            <Email>joshua@stroblindustries.com</Email>
+            <Name>Arjen Runsink</Name>
+            <Email>arjen.runsink@gmail.com</Email>
         </Packager>
         <License>BSD-2-Clause</License>
         <License>CC-BY-SA-3.0</License>
@@ -285,12 +285,12 @@
         </Files>
     </Package>
     <History>
-        <Update release="23">
-            <Date>2019-06-05</Date>
+        <Update release="24">
+            <Date>2019-08-29</Date>
             <Version>3.32.1</Version>
             <Comment>Packaging update</Comment>
-            <Name>Joshua Strobl</Name>
-            <Email>joshua@stroblindustries.com</Email>
+            <Name>Arjen Runsink</Name>
+            <Email>arjen.runsink@gmail.com</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file