diff --git a/message/templates/message_preferences_component.mustache b/message/templates/message_preferences_component.mustache
index 1cf3fc6a8a5..aeac0261a2b 100644
--- a/message/templates/message_preferences_component.mustache
+++ b/message/templates/message_preferences_component.mustache
@@ -66,11 +66,11 @@
         <td class="align-bottom">
             <div class="container-fluid">
                 <div class="row-fluid">
-                    <div class="span6">
+                    <div class="span6 col-xs-6">
                         {{#str}} loggedin, message {{/str}}
                         {{#onlinehelphtml}}{{{.}}}{{/onlinehelphtml}}
                     </div>
-                    <div class="span6">
+                    <div class="span6 col-xs-6">
                         {{#str}} loggedoff, message {{/str}}
                         {{#offlinehelphtml}}{{{.}}}{{/offlinehelphtml}}
                     </div>
diff --git a/message/templates/message_preferences_notification_processor.mustache b/message/templates/message_preferences_notification_processor.mustache
index 0e35d4a4b86..43c38eff4e4 100644
--- a/message/templates/message_preferences_notification_processor.mustache
+++ b/message/templates/message_preferences_notification_processor.mustache
@@ -69,7 +69,7 @@
             <form>
                 <div class="container-fluid">
                     <div class="row-fluid">
-                        <div class="span6">
+                        <div class="span6 col-xs-6">
                             {{#loggedin}}
                                 {{< core/hover_tooltip }}
                                     {{$anchor}}
@@ -94,7 +94,7 @@
                                 {{/ core/hover_tooltip }}
                             {{/loggedin}}
                         </div>
-                        <div class="span6">
+                        <div class="span6 col-xs-6">
                             {{#loggedoff}}
                                 {{< core/hover_tooltip }}
                                     {{$anchor}}
diff --git a/message/templates/notification_preferences_component.mustache b/message/templates/notification_preferences_component.mustache
index c220e719624..59f529592c1 100644
--- a/message/templates/notification_preferences_component.mustache
+++ b/message/templates/notification_preferences_component.mustache
@@ -73,11 +73,11 @@
         <td class="align-bottom">
             <div class="container-fluid">
                 <div class="row-fluid">
-                    <div class="span6">
+                    <div class="span6 col-xs-6">
                         {{#str}} loggedin, message {{/str}}
                         {{#onlinehelphtml}}{{{.}}}{{/onlinehelphtml}}
                     </div>
-                    <div class="span6">
+                    <div class="span6 col-xs-6">
                         {{#str}} loggedoff, message {{/str}}
                         {{#offlinehelphtml}}{{{.}}}{{/offlinehelphtml}}
                     </div>
diff --git a/message/templates/notification_preferences_component_notification.mustache b/message/templates/notification_preferences_component_notification.mustache
index acc39f8d373..0f107674273 100644
--- a/message/templates/notification_preferences_component_notification.mustache
+++ b/message/templates/notification_preferences_component_notification.mustache
@@ -67,7 +67,7 @@
                 <form>
                     <div class="container-fluid">
                         <div class="row-fluid">
-                            <div class="span6">
+                            <div class="span6 col-xs-6">
                                 {{#loggedin}}
                                     {{< core/hover_tooltip }}
                                         {{$anchor}}
@@ -92,7 +92,7 @@
                                     {{/ core/hover_tooltip }}
                                 {{/loggedin}}
                             </div>
-                            <div class="span6">
+                            <div class="span6 col-xs-6">
                                 {{#loggedoff}}
                                     {{< core/hover_tooltip }}
                                         {{$anchor}}