diff --git a/app/views/comments/_new_comment.html.haml b/app/views/comments/_new_comment.html.haml
index 96b14fe86..af5d3294b 100644
--- a/app/views/comments/_new_comment.html.haml
+++ b/app/views/comments/_new_comment.html.haml
@@ -10,4 +10,4 @@
   = comment.hidden_field :post_id, :id => "post_id_on_#{post.id}", :value => post.id
 
   %p{:style => "text-align:right;"}
-    = comment.submit t('.comment'), :id => "comment_submit_#{post.id}", :class => "comment_submit button"
+    = comment.submit t('.comment'), :id => "comment_submit_#{post.id}", :class => "comment_submit button", :disable_with => t('.commenting')
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 9c40b8d93..bc66fab5a 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -186,6 +186,7 @@ en:
   comments:
       new_comment:
           comment: "Comment"
+          commenting: "Commenting..."
   photos:
       show:
           delete_photo: "Delete Photo"