diff --git a/app/views/templates/comment_stream.jst b/app/views/templates/comment_stream.jst
index 7a413e212..8ba619497 100644
--- a/app/views/templates/comment_stream.jst
+++ b/app/views/templates/comment_stream.jst
@@ -18,8 +18,7 @@
       </a>
 
       <p>
-      <label for="comment_text_on_<%= id %>"><%= Diaspora.I18n.t('stream.comment') %></label>
-        <textarea class="comment_box" id="comment_text_on_<%= id %>" name="text" rows="2" />
+        <textarea class="comment_box" id="comment_text_on_<%= id %>" name="text" rows="2" placeholder="<%= Diaspora.I18n.t('stream.comment') %>"/>
       </p>
       <div class="submit_button">
         <input class="button creation" id="comment_submit_<%= id %>" name="commit" type="submit" value="<%= Diaspora.I18n.t('stream.comment') %>" />
diff --git a/public/javascripts/app/views/commment_stream_view.js b/public/javascripts/app/views/commment_stream_view.js
index 9f8ea5455..ddf43994f 100644
--- a/public/javascripts/app/views/commment_stream_view.js
+++ b/public/javascripts/app/views/commment_stream_view.js
@@ -16,7 +16,7 @@ app.views.CommentStream = app.views.Base.extend({
   },
 
   postRenderTemplate : function() {
-    this.$("label").inFieldLabels();
+    this.$("textarea").placeholder();
     this.model.comments.each(this.appendComment, this);
 
     // add autoexpanders to new comment textarea