diff --git a/src/com/fsck/k9/mail/store/LocalStore.java b/src/com/fsck/k9/mail/store/LocalStore.java
index aebe29d36..f47457d4f 100644
--- a/src/com/fsck/k9/mail/store/LocalStore.java
+++ b/src/com/fsck/k9/mail/store/LocalStore.java
@@ -2502,7 +2502,11 @@ public class LocalStore extends Store implements Serializable
                 int start = m.start();
                 if (start == 0 || (start != 0 && text.charAt(start - 1) != '@'))
                 {
-                    m.appendReplacement(sb, "<a href=\"$0\">$0</a>");
+                    if (m.group().indexOf(':') > 0) { // With no URI-schema we may get "http:/" links with the second / missing
+                        m.appendReplacement(sb, "<a href=\"$0\">$0</a>");
+                    } else {
+                        m.appendReplacement(sb, "<a href=\"http://$0\">$0</a>");                    	
+                    }
                 }
                 else
                 {