From 13dd21bebbcb8a4718736968e59bae4a5501976f Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Tue, 27 Sep 2016 16:10:44 -0400
Subject: [PATCH] (fix) added sort by arrival date in Mail module (fixes #708)

---
 UI/MailerUI/English.lproj/Localizable.strings   | 1 +
 UI/Templates/MailerUI/UIxMailFolderTemplate.wox | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/UI/MailerUI/English.lproj/Localizable.strings b/UI/MailerUI/English.lproj/Localizable.strings
index 2cff5d291..35b7841eb 100644
--- a/UI/MailerUI/English.lproj/Localizable.strings
+++ b/UI/MailerUI/English.lproj/Localizable.strings
@@ -344,6 +344,7 @@
 "Set as Junk" = "Set as Junk";
 
 "Sort" = "Sort";
+"Order Received" = "Order Received";
 "Descending Order" = "Descending Order";
 "Back" = "Back";
 "Copy messages" = "Copy messages";
diff --git a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
index 4fa98659f..4d49298ca 100644
--- a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
@@ -100,6 +100,12 @@
                   <!-- size --></md-icon> <var:string label:value="Size"/>
               </md-button>
             </md-menu-item>
+	    <md-menu-item>
+              <md-button ng-click="mailbox.sort('arrival')">
+                <md-icon ng-class="{ 'icon-check': mailbox.sortedBy('arrival') }">
+                  <!-- order received --></md-icon> <var:string label:value="Order Received"/>
+              </md-button>
+            </md-menu-item>
             <md-menu-divider> <!-- divider --></md-menu-divider>
             <md-menu-item>
               <sg-checkmark