diff --git a/src/com/android/email/mail/store/LocalStore.java b/src/com/android/email/mail/store/LocalStore.java
index ddfddcdff..aa8656d05 100644
--- a/src/com/android/email/mail/store/LocalStore.java
+++ b/src/com/android/email/mail/store/LocalStore.java
@@ -1447,7 +1447,11 @@ public class LocalStore extends Store implements Serializable {
                     sbHtml.append(htmlifyString(sbText.toString()));
                 }
                
-                Spannable markup = new SpannableString(sbHtml.toString().replaceAll("cid:", "http://cid/"));
+                String html = sbHtml.toString();
+                if (html.indexOf("cid:")!=-1) {
+                    html = html.replaceAll("cid:", "http://cid/");
+                }
+                Spannable markup = new SpannableString(html);
                 Linkify.addLinks(markup, Linkify.ALL);
                 StringBuffer sb = new StringBuffer(markup.length());
                 sb.append(markup.toString());