From b1f9b9ac6cb3e37344410cc5935be50d3cd50f78 Mon Sep 17 00:00:00 2001
From: ndew623 <ndew623@users.noreply.github.com>
Date: Sun, 26 Mar 2017 13:52:12 -0500
Subject: [PATCH] Changed string in options to say "reply header" instead of
 "reply quotes". Normalized locale in reply header when Hide timezone option
 is selected.

---
 .../main/java/com/fsck/k9/message/quote/QuoteHelper.java | 9 +++++++--
 k9mail/src/main/res/values/strings.xml                   | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/k9mail/src/main/java/com/fsck/k9/message/quote/QuoteHelper.java b/k9mail/src/main/java/com/fsck/k9/message/quote/QuoteHelper.java
index 830d3eff7..599bb2526 100644
--- a/k9mail/src/main/java/com/fsck/k9/message/quote/QuoteHelper.java
+++ b/k9mail/src/main/java/com/fsck/k9/message/quote/QuoteHelper.java
@@ -28,10 +28,15 @@ class QuoteHelper {
             final int dateStyle = DateFormat.LONG;
             final int timeStyle = DateFormat.LONG;
             Date date = message.getSentDate();
-            Locale locale = resources.getConfiguration().locale;
-            DateFormat dateFormat = DateFormat.getDateTimeInstance(dateStyle, timeStyle, locale);
+            DateFormat dateFormat;
+            Locale locale;
             if (K9.hideTimeZone()) {
+                locale=Locale.ROOT;
+                dateFormat = DateFormat.getDateTimeInstance(dateStyle, timeStyle, locale);
                 dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+            } else {
+                locale = resources.getConfiguration().locale;
+                dateFormat = DateFormat.getDateTimeInstance(dateStyle, timeStyle, locale);
             }
             return dateFormat.format(date);
         } catch (Exception e) {
diff --git a/k9mail/src/main/res/values/strings.xml b/k9mail/src/main/res/values/strings.xml
index c6d0d2a76..512c8b7d3 100644
--- a/k9mail/src/main/res/values/strings.xml
+++ b/k9mail/src/main/res/values/strings.xml
@@ -342,7 +342,7 @@ Please submit bug reports, contribute new features and ask questions at
     <string name="global_settings_privacy_hide_useragent">Hide mail client</string>
     <string name="global_settings_privacy_hide_useragent_detail">Remove K-9 User-Agent from mail headers</string>
     <string name="global_settings_privacy_hide_timezone">Hide timezone</string>
-    <string name="global_settings_privacy_hide_timezone_detail">Use UTC instead of local timezone in mail headers and reply quotes</string>
+    <string name="global_settings_privacy_hide_timezone_detail">Use UTC instead of local timezone in mail headers and reply header</string>
     <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>
     <string name="global_settings_notification_hide_subject_never">Never</string>
     <string name="global_settings_notification_hide_subject_when_locked">When device is locked</string>