diff --git a/app/assets/stylesheets/conversations.css.scss b/app/assets/stylesheets/conversations.css.scss
index 99c6f169e..ef3822f96 100644
--- a/app/assets/stylesheets/conversations.css.scss
+++ b/app/assets/stylesheets/conversations.css.scss
@@ -1,10 +1,3 @@
-.span-24 {
-  width: 100%;
-  margin: 0;
-  padding: 0;
-}
-
-
 .conversations_container {
   padding-top: 40px;
 
diff --git a/app/controllers/conversations_controller.rb b/app/controllers/conversations_controller.rb
index 8fae94655..a4be3ea0c 100644
--- a/app/controllers/conversations_controller.rb
+++ b/app/controllers/conversations_controller.rb
@@ -1,5 +1,7 @@
 class ConversationsController < ApplicationController
   before_filter :authenticate_user!
+
+  layout ->(c) { request.format == :mobile ? "application" : "with_header" }
   before_filter -> { @css_framework = :bootstrap }
 
   respond_to :html, :mobile, :json, :js