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
Hide mail client
Remove K-9 User-Agent from mail headers
Hide timezone
- Use UTC instead of local timezone in mail headers and reply quotes
+ Use UTC instead of local timezone in mail headers and reply header
Hide subject in notifications
Never
When device is locked