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 282066e13..16bf0e228 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -540,9 +540,10 @@ public class MessageAdapter extends ArrayAdapter<Message> {
                 end = quirk.length();
             } else if (start == -1) {
                 start = 0;
-            } else if (end == -1) {
+            } else if (end == -1 || end >= body.length()) {
                 end = body.length();
             }
+
             applyQuoteSpan(body, start, end, darkBackground, true, message);
         }
         return startsWithQuote;