diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index a0e33acf9397b4865bd12fea0a32a91f3864e6ad..d7da48c895f181d52837d35ca909fde7c33b8a72 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -593,10 +593,11 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
     public String getBody(final boolean removeQuoteFallbacks) {
         if (body == null) return "";
 
-        Pair<StringBuilder, Boolean> result =
-            removeQuoteFallbacks
-            ? bodyMinusFallbacks("http://jabber.org/protocol/address", Namespace.OOB, "urn:xmpp:reply:0")
-            : bodyMinusFallbacks("http://jabber.org/protocol/address", Namespace.OOB);
+        List<String> fallbacksToRemove = new ArrayList<>();
+        fallbacksToRemove.add("http://jabber.org/protocol/address");
+        if (getOob() != null || isGeoUri()) fallbacksToRemove.add(Namespace.OOB);
+        if (removeQuoteFallbacks) fallbacksToRemove.add("urn:xmpp:reply:0");
+        Pair<StringBuilder, Boolean> result = bodyMinusFallbacks(fallbacksToRemove.toArray(new String[0]));
         StringBuilder body = result.first;
 
         final String aesgcm = MessageUtils.aesgcmDownloadable(body.toString());