diff --git a/res/res_jabber.c b/res/res_jabber.c
index 0cdbc9b215..1c7a2349ef 100644
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -3356,8 +3356,8 @@ static int aji_handle_pubsub_event(void *data, ikspak *pak)
 		sscanf(iks_find_cdata(item_content, "OLDMSGS"), "%10d", &oldmsgs);
 		sscanf(iks_find_cdata(item_content, "NEWMSGS"), "%10d", &newmsgs);
 		if (!(event = ast_event_new(AST_EVENT_MWI, AST_EVENT_IE_MAILBOX,
-			AST_EVENT_IE_PLTYPE_STR, item_id, AST_EVENT_IE_CONTEXT,
-			AST_EVENT_IE_PLTYPE_STR, context, AST_EVENT_IE_OLDMSGS,
+			AST_EVENT_IE_PLTYPE_STR, context, AST_EVENT_IE_CONTEXT,
+			AST_EVENT_IE_PLTYPE_STR, item_id, AST_EVENT_IE_OLDMSGS,
 			AST_EVENT_IE_PLTYPE_UINT, oldmsgs, AST_EVENT_IE_NEWMSGS,
 			AST_EVENT_IE_PLTYPE_UINT, newmsgs, AST_EVENT_IE_EID, AST_EVENT_IE_PLTYPE_RAW,
 			&pubsub_eid, sizeof(pubsub_eid), AST_EVENT_IE_END))) {
diff --git a/res/res_xmpp.c b/res/res_xmpp.c
index 8f0f8b5a14..30e2c4059a 100644
--- a/res/res_xmpp.c
+++ b/res/res_xmpp.c
@@ -1345,8 +1345,8 @@ static int xmpp_pubsub_handle_event(void *data, ikspak *pak)
 		sscanf(iks_find_cdata(item_content, "OLDMSGS"), "%10d", &oldmsgs);
 		sscanf(iks_find_cdata(item_content, "NEWMSGS"), "%10d", &newmsgs);
 		if (!(event = ast_event_new(AST_EVENT_MWI, AST_EVENT_IE_MAILBOX,
-					    AST_EVENT_IE_PLTYPE_STR, item_id, AST_EVENT_IE_CONTEXT,
-					    AST_EVENT_IE_PLTYPE_STR, context, AST_EVENT_IE_OLDMSGS,
+					    AST_EVENT_IE_PLTYPE_STR, context, AST_EVENT_IE_CONTEXT,
+					    AST_EVENT_IE_PLTYPE_STR, item_id, AST_EVENT_IE_OLDMSGS,
 					    AST_EVENT_IE_PLTYPE_UINT, oldmsgs, AST_EVENT_IE_NEWMSGS,
 					    AST_EVENT_IE_PLTYPE_UINT, newmsgs, AST_EVENT_IE_EID, AST_EVENT_IE_PLTYPE_RAW,
 					    &pubsub_eid, sizeof(pubsub_eid), AST_EVENT_IE_END))) {