diff --git a/src/messaging.js b/src/messaging.js
index 9e9495337e..980dc13e86 100644
--- a/src/messaging.js
+++ b/src/messaging.js
@@ -74,8 +74,14 @@ var db = require('./database'),
 								if (err) {
 									return next(err);
 								}
+
+								if (!messages || !messages[0]) {
+									return next(null, null);
+								}
+								
 								messages[0].newSet = isNewSet;
-								next(null, messages ? messages[0] : null);
+								messages[0].mid = mid;
+								next(null, messages[0]);
 							});
 						}
 					], callback);