diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss
index 9205fc3c5f..b6669d88cb 100644
--- a/stylesheets/_conversation.scss
+++ b/stylesheets/_conversation.scss
@@ -227,6 +227,7 @@
 
 .timestamp {
   margin-right: 3px;
+  white-space: nowrap;
 }
 
 .message-container,
diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css
index 73506c73aa..5e7b4b892a 100644
--- a/stylesheets/manifest.css
+++ b/stylesheets/manifest.css
@@ -864,7 +864,8 @@ input.search {
   font-weight: bold; }
 
 .timestamp {
-  margin-right: 3px; }
+  margin-right: 3px;
+  white-space: nowrap; }
 
 .message-container,
 .message-list {