diff --git a/src/main/java/eu/siacs/conversations/crypto/PgpDecryptionService.java b/src/main/java/eu/siacs/conversations/crypto/PgpDecryptionService.java
index 73da1fb9611411cc5b53f288ece3a59878767a0b..082c7474f2f1636621a8519005d6f637c331fb37 100644
--- a/src/main/java/eu/siacs/conversations/crypto/PgpDecryptionService.java
+++ b/src/main/java/eu/siacs/conversations/crypto/PgpDecryptionService.java
@@ -64,6 +64,11 @@ public class PgpDecryptionService {
         this.pendingNotifications.removeAll(discards);
     }
 
+    public synchronized void discard(Message message) {
+        this.messages.remove(message);
+        this.pendingNotifications.remove(message);
+    }
+
 	protected synchronized void decryptNext() {
 		if (pendingIntent == null
                 && getOpenPgpApi() != null
diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 1dd8026ba61ea948957973afc25286b34a667d15..f965e561fbdf277e7fe3e6082f349998cb108622 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -483,6 +483,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
 							sendMessageReceipts(account, packet);
 						}
 						if (replacedMessage.getEncryption() == Message.ENCRYPTION_PGP) {
+							conversation.getAccount().getPgpDecryptionService().discard(replacedMessage);
 							conversation.getAccount().getPgpDecryptionService().decrypt(replacedMessage, false);
 						}
 						return;