1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index 7dc0697db..8a1db5736 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -1840,7 +1840,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
     }
 
     public void resendMessage(final Message message) {
-        if (message.isFileOrImage()) {
+        if (message != null && message.isFileOrImage()) {
             DownloadableFile file = activity.xmppConnectionService.getFileBackend().getFile(message);
             if (file.exists()) {
                 final Conversation conversation = message.getConversation();