1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Account.java b/src/main/java/de/pixart/messenger/entities/Account.java
index e9fb800cc..18e991367 100644
--- a/src/main/java/de/pixart/messenger/entities/Account.java
+++ b/src/main/java/de/pixart/messenger/entities/Account.java
@@ -554,7 +554,11 @@ public class Account extends AbstractEntity {
     public boolean setPgpSignId(long pgpID) {
         synchronized (this.keys) {
             try {
-                keys.put(KEY_PGP_ID, pgpID);
+                if (pgpID == 0) {
+                    keys.remove(KEY_PGP_ID);
+                } else {
+                    keys.put(KEY_PGP_ID, pgpID);
+                }
             } catch (JSONException e) {
                 return false;
             }