diff --git a/app/views/conversations/_show.haml b/app/views/conversations/_show.haml
index de44a52f8..98316933f 100644
--- a/app/views/conversations/_show.haml
+++ b/app/views/conversations/_show.haml
@@ -28,5 +28,5 @@
       .content
         = form_for [conversation, Message.new] do |message|
           = message.text_area :text, :rows => 5, :tabindex => 1
-          .right
+          .left
             = message.submit t('.reply').capitalize, :disable_with => t('.replying'), :class => 'button creation', :tabindex => 2
diff --git a/config/application.yml.example b/config/application.yml.example
index 69ebca59c..d6d34eaa6 100644
--- a/config/application.yml.example
+++ b/config/application.yml.example
@@ -214,6 +214,7 @@ defaults: &defaults
 development:
   <<: *defaults
   serve_static_assets: true
+  no_follow_diasporahq: true
 
 production:
   <<: *defaults