diff --git a/templates/build_template.go b/templates/build_template.go
index 5dd3d3c4..57a0d485 100644
--- a/templates/build_template.go
+++ b/templates/build_template.go
@@ -728,6 +728,7 @@ apply_patches() {
   patch_priv_ext
   patch_launcher
   patch_broken_alarmclock
+  patch_broken_messaging
   patch_disable_apex
 }
 
@@ -753,6 +754,16 @@ patch_broken_alarmclock() {
   fi
 }
 
+# TODO: remove once this once fix from upstream makes it into release branch
+# https://android.googlesource.com/platform/packages/apps/Messaging/+/8e71d1b707123e1b48b5529b1661d53762922400%5E%21/
+patch_broken_messaging() {
+  log_header ${FUNCNAME}
+
+  if ! grep -q "android:targetSdkVersion=\"24\"" ${BUILD_DIR}/packages/apps/Messaging/AndroidManifest.xml; then
+    sed -i 's@<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />@<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="24" />@' ${BUILD_DIR}/packages/apps/Messaging/AndroidManifest.xml
+  fi
+}
+
 patch_aosp_removals() {
   log_header ${FUNCNAME}