diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java
index c2020c57e..129d10973 100644
--- a/src/com/fsck/k9/activity/MessageView.java
+++ b/src/com/fsck/k9/activity/MessageView.java
@@ -301,7 +301,7 @@ public class MessageView extends Activity
// UrlInterceptRegistry.registerHandler(this);
mMessageContentView.getSettings().setBlockNetworkImage(true);
- mMessageContentView.getSettings().setSupportZoom(false);
+ mMessageContentView.getSettings().setSupportZoom(true);
setTitle("");
@@ -736,12 +736,29 @@ public class MessageView extends Activity
if (part.getMimeType().equalsIgnoreCase("text/html")) {
text = text.replaceAll("cid:", "http://cid/");
} else {
- /*
+ Matcher m = Regex.WEB_URL_PATTERN.matcher(text);
+ StringBuffer sb = new StringBuffer();
+ while (m.find()) {
+ int start = m.start();
+ if (start != 0 && text.charAt(start - 1) != '@') {
+ m.appendReplacement(sb, "$0");
+ }
+ else {
+ m.appendReplacement(sb, "$0");
+ }
+ }
+ m.appendTail(sb);
+
+/*
* Convert plain text to HTML by replacing
* \r?\n with
and adding a html/body wrapper.
*/
- text = text.replaceAll("\r?\n", "
");
+ text = sb.toString().replaceAll("\r?\n", "
");
+
+
+
text = "" + text + "";
+
}
@@ -755,7 +772,6 @@ public class MessageView extends Activity
}
markup = new SpannableString(text);
Linkify.addLinks(markup, Linkify.ALL);
-
mMessageContentView.loadDataWithBaseURL("email://", markup.toString(), "text/html",
"utf-8", null);
}