diff --git a/app/views/conversations/_show.haml b/app/views/conversations/_show.haml
index 43623aae6..29e37e36a 100644
--- a/app/views/conversations/_show.haml
+++ b/app/views/conversations/_show.haml
@@ -29,4 +29,4 @@
         = form_for [conversation, Message.new] do |message|
           = message.text_area :text, :rows => 5, :tabindex => 1
           .right
-            = message.submit t('.reply').capitalize, :class => 'button creation', :tabindex => 2
+            = message.submit t('.reply').capitalize, :disable_with => t('.replying'), :class => 'button creation', :tabindex => 2
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 700fb2585..9b3397fab 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -233,6 +233,7 @@ en:
       inbox: "Inbox"
     show:
       reply: "reply"
+      replying: "Replying..."
       delete: "delete and block conversation"
     new:
       to: "to"