diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 5c91043430750327da9faf498c4b67b7c5596def..dd0bdc5893c343e5f2de35b2faf4e94329fb8e05 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -371,9 +371,8 @@ public class MessageAdapter extends ArrayAdapter<Message> {
                 if (lineStart == -1) {
                     if (previous == '\n') {
                         if (
-                                (QuoteHelper.isPositionQuoteStart(body, i)
-                                        || (current == '\u00bb' && !UIHelper.isPositionFollowedByQuote(body, i)
-                                ))) {
+                                QuoteHelper.isPositionQuoteStart(body, i)
+                        ) {
                             // Line start with quote
                             lineStart = i;
                             if (quoteStart == -1) quoteStart = i;
diff --git a/src/main/java/eu/siacs/conversations/utils/MessageUtils.java b/src/main/java/eu/siacs/conversations/utils/MessageUtils.java
index c9c029c65b0ee833733e83ff32ee5f2774397ecd..0a11cd720412476334f94f8ae127b89a11f4ddfd 100644
--- a/src/main/java/eu/siacs/conversations/utils/MessageUtils.java
+++ b/src/main/java/eu/siacs/conversations/utils/MessageUtils.java
@@ -70,8 +70,7 @@ public class MessageUtils {
                 continue;
             }
             final char c = line.charAt(0);
-            if (QuoteHelper.isNestedTooDeeply(line)
-                    || (c == '\u00bb' && !UIHelper.isPositionFollowedByQuote(line, 0))) {
+            if (QuoteHelper.isNestedTooDeeply(line)) {
                 continue;
             }
             if (builder.length() != 0) {