diff --git a/src/messaging.js b/src/messaging.js
index dd72ae14d3..d6cd44be5a 100644
--- a/src/messaging.js
+++ b/src/messaging.js
@@ -221,32 +221,27 @@ var db = require('./database'),
 				return callback(err);
 			}
 
-			async.parallel({
-				unreadUids: async.apply(db.isSortedSetMembers, 'uid:' + uid + ':chats:unread', uids),
-				users: async.apply(user.getMultipleUserFields, uids, ['username', 'picture', 'uid'])
-			}, function(err, results) {
+			db.isSortedSetMembers('uid:' + uid + ':chats:unread', uids, function(err, unreadUids) {
 				if (err) {
 					return callback(err);
 				}
-				var users = results.users;
 
-				for (var i=0; i<users.length; ++i) {
-					users[i].unread = results.unreadUids[i];
-				}
-
-				users = users.filter(function(user, index) {
-					return !!user.uid;
-				});
+				user.isOnline(uids, function(err, users) {
+					if (err) {
+						return callback(err);
+					}
 
-				async.map(users, function(userData, next) {
-					user.isOnline(userData.uid, function(err, data) {
-						if (err) {
-							return next(err);
+					users.forEach(function(user, index) {
+						if (user) {
+							user.unread = unreadUids[index];
 						}
-						userData.status = data.status;
-						next(null, userData);
 					});
-				}, callback);
+
+					users = users.filter(function(user) {
+						return !!user.uid;
+					});
+					callback(null, users);
+				});
 			});
 		});
 	};
diff --git a/src/user.js b/src/user.js
index c0e96960c6..535bffa7b0 100644
--- a/src/user.js
+++ b/src/user.js
@@ -442,6 +442,10 @@ var bcrypt = require('bcryptjs'),
 				return user;
 			});
 
+			if (uids.length === 1) {
+				userData = userData[0];
+			}
+
 			callback(null, userData);
 		});
 	};