diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/AttachmentKeyboardMediaAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/AttachmentKeyboardMediaAdapter.java
index 4ca527bd3f..ccef3c7a0d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/AttachmentKeyboardMediaAdapter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/AttachmentKeyboardMediaAdapter.java
@@ -107,7 +107,7 @@ class AttachmentKeyboardMediaAdapter extends RecyclerView.Adapter<AttachmentKeyb
       time -= TimeUnit.HOURS.toMillis(hours);
 
       long minutes = TimeUnit.MILLISECONDS.toMinutes(time);
-      time -= TimeUnit.MINUTES.toHours(time);
+      time -= TimeUnit.MINUTES.toMillis(minutes);
 
       long seconds = TimeUnit.MILLISECONDS.toSeconds(time);