diff --git a/src/info/guardianproject/otr/app/im/app/MessageView.java b/src/info/guardianproject/otr/app/im/app/MessageView.java
index 3694f68..326581e 100644
--- a/src/info/guardianproject/otr/app/im/app/MessageView.java
+++ b/src/info/guardianproject/otr/app/im/app/MessageView.java
@@ -196,8 +196,11 @@ public class MessageView extends LinearLayout {
     }
 
     private SpannableString formatTimeStamp(Date date) {
-        DateFormat format = new SimpleDateFormat(mResources.getString(R.string.time_stamp));
-        String dateStr = format.format(date);
+        DateFormat dateFormat =
+            android.text.format.DateFormat.getDateFormat(getContext());
+        DateFormat timeFormat =
+            android.text.format.DateFormat.getTimeFormat(getContext());
+        String dateStr = dateFormat.format(date) + " " + timeFormat.format(date);
         SpannableString spanText = new SpannableString(dateStr);
         int len = spanText.length();
         spanText.setSpan(new StyleSpan(Typeface.ITALIC), 0, len, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);