1 files changed, 7 insertions, 1 deletions
diff --git a/api/post.go b/api/post.go
index 60ac11a2b..4533823f6 100644
--- a/api/post.go
+++ b/api/post.go
@@ -597,7 +597,13 @@ func sendNotifications(c *Context, post *model.Post, team *model.Team, channel *
 		for _, id := range mentionedUsersList {
 			userAllowsEmails := profileMap[id].NotifyProps["email"] != "false"
 
-			if userAllowsEmails && (profileMap[id].IsAway() || profileMap[id].IsOffline()) {
+			var status *model.Status
+			var err *model.AppError
+			if status, err = GetStatus(id); err != nil {
+				status = &model.Status{id, model.STATUS_OFFLINE, 0}
+			}
+
+			if userAllowsEmails && status.Status != model.STATUS_ONLINE {
 				sendNotificationEmail(c, post, profileMap[id], channel, team, senderName)
 			}
 		}