From af88cfc4828b1e2844d335e5eda9e942235526f0 Mon Sep 17 00:00:00 2001
From: Andy Stadler <>
Date: Wed, 15 Apr 2009 13:01:48 -0700
Subject: [PATCH] AI 146361: am: CL 146359 DO NOT MERGE - we'll keep the fix
 for donut+   Automated g4 rollback of changelist 146273.   *** Reason for
 rollback ***   Inadvertently approved for cupcake, past deadline.   ***
 Original change description ***   Fixed "show pictures" button isnot
 displayed for HTML messages.   Original author: stadler   Merged from:
 //branches/cupcake/...

Automated import of CL 146361
---
 src/com/android/email/activity/MessageView.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/android/email/activity/MessageView.java b/src/com/android/email/activity/MessageView.java
index 3928942a3..cfa9c4585 100644
--- a/src/com/android/email/activity/MessageView.java
+++ b/src/com/android/email/activity/MessageView.java
@@ -93,8 +93,8 @@ public class MessageView extends Activity
     };
     private static final int METHODS_STATUS_COLUMN = 1;
 
-    // regex that matches start of img tag. '<(?i)img\s+'.
-    private static final Pattern IMG_TAG_START_REGEX = Pattern.compile("<(?i)img\\s+");
+    // regex that matches start of img tag. '.*<(?i)img\s+.*'.
+    private static final Pattern IMG_TAG_START_REGEX = Pattern.compile(".*<(?i)img\\s+.*");
 
     private TextView mSubjectView;
     private TextView mFromView;
@@ -963,7 +963,7 @@ public class MessageView extends Activity
                      * that HTML allows.
                      */
                     // Check if text contains img tag.
-                    if (IMG_TAG_START_REGEX.matcher(text).find()) {
+                    if (IMG_TAG_START_REGEX.matcher(text).matches()) {
                         mHandler.showShowPictures(true);
                     }