From 0c9a301f25f36fdcfb3e46b7a44da26dad1450e1 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu, 22 Sep 2016 15:51:56 -0400
Subject: [PATCH] Automatically mark msg as read in Mail module

This avoids an extra XHR to the server.
---
 UI/MailerUI/UIxMailView.m                          | 3 +++
 UI/WebServerResources/js/Mailer/Message.service.js | 8 ++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/UI/MailerUI/UIxMailView.m b/UI/MailerUI/UIxMailView.m
index 4068f1c8f..6f3b60b24 100644
--- a/UI/MailerUI/UIxMailView.m
+++ b/UI/MailerUI/UIxMailView.m
@@ -278,6 +278,9 @@ static NSString *mailETag = nil;
                             andJSONRepresentation: data];
     }
 
+  // Mark message as read
+  [co addFlags: @"seen"];
+
   data = [NSMutableDictionary dictionaryWithObjectsAndKeys:
                        [self attachmentAttrs], @"attachmentAttrs",
                        [self shouldAskReceipt], @"shouldAskReceipt",
diff --git a/UI/WebServerResources/js/Mailer/Message.service.js b/UI/WebServerResources/js/Mailer/Message.service.js
index 1f3643132..907b8ba9f 100644
--- a/UI/WebServerResources/js/Mailer/Message.service.js
+++ b/UI/WebServerResources/js/Mailer/Message.service.js
@@ -672,12 +672,8 @@
     this.$futureMessageData = futureMessageData.then(function(data) {
       // Calling $timeout will force Angular to refresh the view
       if (_this.isread === 0) {
-        Message.$$resource.fetch(_this.$absolutePath(), 'markMessageRead').then(function() {
-          Message.$timeout(function() {
-            _this.isread = true;
-            _this.$mailbox.unseenCount--;
-          });
-        });
+        _this.isread = true;
+        _this.$mailbox.unseenCount--;
       }
       return Message.$timeout(function() {
         angular.extend(_this, data);