diff --git a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
index f449b429447c8f8eb9e348b69b7b9d3cdfa90150..75330415896f4812e88e9b4f982f00ea708ef0d6 100644
--- a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
+++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
@@ -391,11 +391,13 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
 	public void registerDevices(final Jid jid, @NonNull final Set<Integer> deviceIds) {
 		final int hash = deviceIds.hashCode();
 		final boolean me = jid.toBareJid().equals(account.getJid().toBareJid());
-		if (me && hash == this.lastDeviceListNotificationHash) {
-			Log.d(Config.LOGTAG,account.getJid().toBareJid()+": ignoring duplicate own device id list");
-			return;
+		if (me) {
+			if (hash == this.lastDeviceListNotificationHash) {
+				Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": ignoring duplicate own device id list");
+				return;
+			}
+			this.lastDeviceListNotificationHash = hash;
 		}
-		this.lastDeviceListNotificationHash = hash;
 		boolean needsPublishing = me && !deviceIds.contains(getOwnDeviceId());
 		if (me) {
 			deviceIds.remove(getOwnDeviceId());
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 66bb4136ec312c7d2b6ce56fe9b95a47fb3fce1a..51367f1901ccdcf4bec2ad77b7ff7f9e16dd88dc 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -1250,7 +1250,7 @@ public class XmppConnectionService extends Service {
 					if (!message.needsUploading()) {
 						String pgpBody = message.getEncryptedBody();
 						String decryptedBody = message.getBody();
-						message.setBody(pgpBody);
+						message.setBody(pgpBody); //TODO might throw NPE
 						message.setEncryption(Message.ENCRYPTION_PGP);
 						if (message.edited()) {
 							message.setBody(decryptedBody);