diff --git a/jami-android/app/src/main/java/cx/ring/linkpreview/LinkPreview.kt b/jami-android/app/src/main/java/cx/ring/linkpreview/LinkPreview.kt
index ba57520b8910a22418e6da5d9985496e5308e0d8..c1e436569b07573fb2f9ecd9f66d01968face2b4 100644
--- a/jami-android/app/src/main/java/cx/ring/linkpreview/LinkPreview.kt
+++ b/jami-android/app/src/main/java/cx/ring/linkpreview/LinkPreview.kt
@@ -14,9 +14,10 @@ object LinkPreview {
         val matcher = PatternsCompat.AUTOLINK_WEB_URL.matcher(input)
         while (matcher.find()) {
             val word = matcher.group()
+            val start = matcher.start()
             if (!word.startsWith("http://", ignoreCase = true) && !word.startsWith("https://", ignoreCase = true)) {
-                if (PatternsCompat.EMAIL_ADDRESS.matcher(word).matches()) {
-                    continue
+                if (start > 0 && input[start - 1] == '@') {
+                    continue // Skip email addresses
                 }
                 result.add("https://$word")
             } else {