diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 19d1186be72b1cf7c63022e7511c87a58f01ed22..d0f2754cbafc3d0d4761cb7fd3aa6dcbde0cd7c4 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -1124,10 +1124,18 @@ public class XmppConnectionService extends Service {
 						String decryptedBody = message.getBody();
 						message.setBody(pgpBody);
 						message.setEncryption(Message.ENCRYPTION_PGP);
-						databaseBackend.createMessage(message);
-						saveInDb = false;
-						message.setBody(decryptedBody);
-						message.setEncryption(Message.ENCRYPTION_DECRYPTED);
+						if (message.edited()) {
+							message.setBody(decryptedBody);
+							message.setEncryption(Message.ENCRYPTION_DECRYPTED);
+							databaseBackend.updateMessage(message, message.getEditedId());
+							updateConversationUi();
+							return;
+						} else {
+							databaseBackend.createMessage(message);
+							saveInDb = false;
+							message.setBody(decryptedBody);
+							message.setEncryption(Message.ENCRYPTION_DECRYPTED);
+						}
 					}
 					break;
 				case Message.ENCRYPTION_OTR: