1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Message.java b/src/main/java/de/pixart/messenger/entities/Message.java
index 8ac7735d6..5a3549a95 100644
--- a/src/main/java/de/pixart/messenger/entities/Message.java
+++ b/src/main/java/de/pixart/messenger/entities/Message.java
@@ -154,6 +154,8 @@ public class Message extends AbstractEntity {
             }
         } catch (InvalidJidException e) {
             jid = null;
+        } catch (IllegalStateException e) {
+            return null; // message too long?
         }
         Jid trueCounterpart;
         try {