message timestamp is always shown on the bottom right now

css/base.css

@@ -1505,11 +1505,13 @@ i.search {
 }
 
 .chat-box .bubble div.message-content {
+  position: relative;
   color: #212121;
   margin: 0;
   max-width: 36rem;
   overflow-wrap: break-word;
 }
+
 /* The timestamp is a floating element. Need to ensure div.message-content is expanded
  * to accomodate it. It's usually called clearfix. */
 .chat-box .bubble div.message-content:after {
@@ -1520,28 +1522,21 @@ i.search {
   visibility: hidden;
 }
 
+.chat-box .timestamp-padding {
+  display: inline-block;
+  width: 4rem;
+  height: 0;
+}
+
 .chat-box .timestamp {
   position: relative;
   font-size: 80%;
   color: #777;
-  padding-left: 1rem;
+  top: 0.35rem;
-  top: 0.5rem;
   float: right;
   white-space: nowrap;
 }
 
-/* Typing notification bubble */
-.chat-box .typing {
-  display: inline-block;
-  border-radius: 0.5rem;
-  width: 2rem;
-  padding: 0.25rem 0.35rem;
-  vertical-align: middle;
-  text-align: center;
-  color: #aaa;
-  margin-top: 0.75rem;
-}
-
 /* The name of the person who sent the message
  * (group chat only)
  */

src/widgets/chat-message.jsx

@@ -129,8 +129,13 @@ export default class ChatMessage extends React.Component {
         <div>
           <div className={bubbleClass}>
             <div className="message-content">
-              {content}
+              <div>
-              {attachments}
+                {content}
+                {attachments}
+                {this.props.timestamp ?
+                  <span className="timestamp-padding"></span>
+                  : null}
+              </div>
               {this.props.timestamp ?
                 <ReceivedMarker
                   timestamp={this.props.timestamp}

umd/index.dev.js

@@ -7082,7 +7082,9 @@ class ChatMessage extends (react__WEBPACK_IMPORTED_MODULE_0___default().Componen
       className: bubbleClass
     }, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
       className: "message-content"
-    }, content, attachments, this.props.timestamp ? react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_received_marker_jsx__WEBPACK_IMPORTED_MODULE_5__.default, {
+    }, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", null, content, attachments, this.props.timestamp ? react__WEBPACK_IMPORTED_MODULE_0___default().createElement("span", {
+      className: "timestamp-padding"
+    }) : null), this.props.timestamp ? react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_received_marker_jsx__WEBPACK_IMPORTED_MODULE_5__.default, {
       timestamp: this.props.timestamp,
       received: this.props.received
     }) : null), this.props.deleted || !this.props.showContextMenu ? null : react__WEBPACK_IMPORTED_MODULE_0___default().createElement("span", {