From 5020307a6c01122706dff1e835d8f0a93495bb23 Mon Sep 17 00:00:00 2001
From: Ruben Barkow <rubo77@users.noreply.github.com>
Date: Mon, 2 Jan 2017 01:44:04 +0100
Subject: [PATCH 1/2] Add a &nbsp; after timestamp

This solves part of the problem that the timestamp is  gluing at the message, when copied in your clipboard.

Example:

    23:02test message

see https://github.com/vector-im/riot-web/issues/893
---
 src/components/views/messages/MessageTimestamp.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/views/messages/MessageTimestamp.js b/src/components/views/messages/MessageTimestamp.js
index dda87767a6..3a8dd91dc0 100644
--- a/src/components/views/messages/MessageTimestamp.js
+++ b/src/components/views/messages/MessageTimestamp.js
@@ -26,9 +26,8 @@ module.exports = React.createClass({
         var date = new Date(this.props.ts);
         return (
             <span className="mx_MessageTimestamp">
-                { DateUtils.formatTime(date) }
+                { DateUtils.formatTime(date)+'&nbsp;' }
             </span>
         );
     },
 });
-

From b6c002b587b0bb45798973f319427204d1259ef0 Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Mon, 8 Jan 2018 14:35:39 +0000
Subject: [PATCH 2/2] Fix merge

---
 src/components/views/messages/MessageTimestamp.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/views/messages/MessageTimestamp.js b/src/components/views/messages/MessageTimestamp.js
index c802f1194e..f5968a68fc 100644
--- a/src/components/views/messages/MessageTimestamp.js
+++ b/src/components/views/messages/MessageTimestamp.js
@@ -29,8 +29,6 @@ module.exports = React.createClass({
     render: function() {
         const date = new Date(this.props.ts);
         return (
-            <span className="mx_MessageTimestamp">
-                { DateUtils.formatTime(date)+'&nbsp;' }
             <span className="mx_MessageTimestamp" title={ DateUtils.formatFullDate(date, this.props.showTwelveHour) }>
                 { DateUtils.formatTime(date, this.props.showTwelveHour) + '&nbsp;' }
             </span>