diff --git a/Changelog.md b/Changelog.md
index d7ddd7e64..724d0fdca 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -20,6 +20,7 @@ The default for including jQuery from a CDN has changed. If you want to continue
 
 ## Bug fixes
 * orca cannot see 'Add Contact' button [#5158](https://github.com/diaspora/diaspora/pull/5158)
+* Move submit button to the right in conversations view [#4960](https://github.com/diaspora/diaspora/pull/4960)
 
 ## Features
 * Don't pull jQuery from a CDN by default [#5105](https://github.com/diaspora/diaspora/pull/5105)
diff --git a/app/views/conversations/_conversation.haml b/app/views/conversations/_conversation.haml
index 97077e322..bcc528ec5 100644
--- a/app/views/conversations/_conversation.haml
+++ b/app/views/conversations/_conversation.haml
@@ -30,7 +30,8 @@
             = authors[conversation.id].name
         .last_message
           - if conversation.messages.present?
-            = '»' + conversation.messages.last.text + '«'
+            %em
+              = conversation.messages.last.text
         - if other_participants.count > 1
           .participants
             - other_participants.drop(1).take(15).each do |participant|
diff --git a/app/views/conversations/_show.haml b/app/views/conversations/_show.haml
index 4609379fd..bbc699cb9 100644
--- a/app/views/conversations/_show.haml
+++ b/app/views/conversations/_show.haml
@@ -27,4 +27,4 @@
       .bd
         = form_for [conversation, Message.new] do |message|
           = message.text_area :text, :class => 'span12', :rows => 5, :tabindex => 1
-          = message.submit t('.reply').capitalize, 'data-disable-with' => t('.replying'), :class => 'btn btn-primary creation', :tabindex => 2
+          = message.submit t('.reply').capitalize, 'data-disable-with' => t('.replying'), class: 'btn btn-primary pull-right creation', tabindex: 2