diff --git a/connector/mattermost/mattermost.go b/connector/mattermost/mattermost.go
index d39768e..6c0e091 100644
--- a/connector/mattermost/mattermost.go
+++ b/connector/mattermost/mattermost.go
@@ -454,7 +454,7 @@ func (mm *Mattermost) processBacklog(ch *model.Channel, backlog *model.PostList)
 		post := backlog.Posts[post_id]
 		post_time := time.Unix(post.CreateAt/1000, 0)
 		post.Message = fmt.Sprintf("[%s] %s",
-			post_time.Format("2006-01-02 15:04:05 MST"), post.Message)
+			post_time.Format("2006-01-02 15:04 MST"), post.Message)
 		mm.handlePost(ch.Name, post, true)
 	}
 }
diff --git a/external/messenger.py b/external/messenger.py
index 2162ced..cd5d972 100755
--- a/external/messenger.py
+++ b/external/messenger.py
@@ -162,6 +162,11 @@ class InitialSyncThread(threading.Thread):
                     else:
                         messages.append(m)
         for m in reversed(messages):
+            if m.text is None:
+                m.text = ""
+            m.text = "[{}] {}".format(
+                    time.strftime("%Y-%m-%d %H:%M %Z", time.localtime(float(m.timestamp)/1000)).strip(),
+                    m.text)
             self.bridge.onMessage(thread_id=thread.uid,
                                   thread_type=thread.type,
                                   message_object=m)