Fixing DM channel emails (#5038)

api/post.go

@@ -905,11 +905,13 @@ func sendNotificationEmail(c *Context, post *model.Post, user *model.User, chann
 			for i := range teams {
 				if teams[i].Id == team.Id {
 					found = true
+					team = teams[i]
 					break
 				}
 			}
 
-			if !found && len(teams) > 0 {
+			if !found {
+				if len(teams) > 0 {
 					team = teams[0]
 				} else {
 					// in case the user hasn't joined any teams we send them to the select_team page
@@ -917,6 +919,7 @@ func sendNotificationEmail(c *Context, post *model.Post, user *model.User, chann
 				}
 			}
 		}
+	}
 
 	if *utils.Cfg.EmailSettings.EnableEmailBatching {
 		var sendBatched bool