diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 19c2aa782..87993a456 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -254,9 +254,10 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
 				mXmppConnectionService.updateAccountUi();
 			}
 		} else if (AxolotlService.PEP_DEVICE_LIST.equals(node)) {
-			Log.d(Config.LOGTAG, AxolotlService.getLogprefix(account)+"Received PEP device list update from "+ from + ", processing...");
+
 			Element item = items.findChild("item");
 			Set<Integer> deviceIds = mXmppConnectionService.getIqParser().deviceIds(item);
+			Log.d(Config.LOGTAG, AxolotlService.getLogprefix(account)+"Received PEP device list ("+deviceIds+") update from "+ from + ", processing...");
 			AxolotlService axolotlService = account.getAxolotlService();
 			axolotlService.registerDevices(from, deviceIds);
 			mXmppConnectionService.updateAccountUi();
@@ -651,9 +652,9 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
 			}
 		}
 
-		Element event = packet.findChild("event", "http://jabber.org/protocol/pubsub#event");
+		Element event = original.findChild("event", "http://jabber.org/protocol/pubsub#event");
 		if (event != null) {
-			parseEvent(event, from, account);
+			parseEvent(event, original.getFrom(), account);
 		}
 
 		String nick = packet.findChildContent("nick", "http://jabber.org/protocol/nick");