diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 1b9ceb3bba..70f02431a0 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -561,7 +561,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 tvCc.setText(MessageHelper.getFormattedAddresses(message.cc, true));
                 tvBcc.setText(MessageHelper.getFormattedAddresses(message.bcc, true));
 
-                tvTimeEx.setText(df.format(new Date(message.received)));
+                tvTimeEx.setText(df.format(message.received));
 
                 tvSizeEx.setText(message.size == null ? null : Helper.humanReadableByteCount(message.size, true));
                 if (!message.duplicate)
@@ -776,7 +776,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
         private void onShowSnoozed(TupleMessageEx message) {
             if (message.ui_snoozed != null)
-                Toast.makeText(context, new Date(message.ui_snoozed).toString(), Toast.LENGTH_LONG).show();
+                Toast.makeText(context, SimpleDateFormat.getDateTimeInstance()
+                        .format(message.ui_snoozed), Toast.LENGTH_LONG).show();
         }
 
         private void onToggleFlag(TupleMessageEx message) {
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 78ac886a10..a24b19673d 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -562,7 +562,7 @@ public class ServiceSynchronize extends LifecycleService {
                 sb.append("<strong>").append(MessageHelper.getFormattedAddresses(message.from, false)).append("</strong>");
                 if (!TextUtils.isEmpty(message.subject))
                     sb.append(": ").append(message.subject);
-                sb.append(" ").append(df.format(new Date(message.received)));
+                sb.append(" ").append(df.format(message.received));
                 sb.append("<br>");
             }