diff --git a/src/org/thoughtcrime/securesms/ConversationFragment.java b/src/org/thoughtcrime/securesms/ConversationFragment.java
index 9260a49c5d..bb4a2a504f 100644
--- a/src/org/thoughtcrime/securesms/ConversationFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationFragment.java
@@ -205,9 +205,9 @@ public class ConversationFragment extends ListFragment
     String dateFormatPattern;
 
     if (DateFormat.is24HourFormat(getActivity().getApplicationContext())) {
-      dateFormatPattern = "EEE MMM d, yyyy 'at' HH:mm:ss zzz";
+      dateFormatPattern = "EEE MMM d, yyyy '-' HH:mm:ss zzz";
     } else {
-      dateFormatPattern = "EEE MMM d, yyyy 'at' hh:mm:ss a zzz";
+      dateFormatPattern = "EEE MMM d, yyyy '-' hh:mm:ss a zzz";
     }
 
     SimpleDateFormat    dateFormatter = new SimpleDateFormat(dateFormatPattern);