diff --git a/src/components/messages/MessageIncoming.vue b/src/components/messages/MessageIncoming.vue
index da616c8..d468d5c 100644
--- a/src/components/messages/MessageIncoming.vue
+++ b/src/components/messages/MessageIncoming.vue
@@ -4,7 +4,7 @@
     <div v-if="showSenderAndTime || room.displayType == ROOM_TYPE_CHANNEL" class="senderAndTime">
       <div class="sender">{{ eventSenderDisplayName(event) }}</div>
       <div class="time">
-        {{ utils.formatTime(event.event.origin_server_ts) }}
+        {{ room.displayType == ROOM_TYPE_CHANNEL ? formatTimeAgo(event.event.origin_server_ts) : utils.formatTime(event.event.origin_server_ts) }}
       </div>
     </div>
     <v-avatar class="avatar" ref="avatar" size="32" color="#ededed" @click.stop="otherAvatarClicked($refs.avatar.$el)">
diff --git a/src/components/messages/MessageOutgoing.vue b/src/components/messages/MessageOutgoing.vue
index 10e2c66..da41b18 100644
--- a/src/components/messages/MessageOutgoing.vue
+++ b/src/components/messages/MessageOutgoing.vue
@@ -4,7 +4,7 @@
     <div class="senderAndTime">
       <div class="sender" v-if="room.displayType == ROOM_TYPE_CHANNEL">{{ eventSenderDisplayName(event) }}</div>
       <div class="time">
-        {{ utils.formatTime(event.event.origin_server_ts) }}
+        {{ room.displayType == ROOM_TYPE_CHANNEL ? formatTimeAgo(event.event.origin_server_ts) : utils.formatTime(event.event.origin_server_ts) }}
       </div>
       <div class="status">{{ event.status }}</div>
     </div>