diff --git a/app/assets/javascripts/app/forms/post_form.js b/app/assets/javascripts/app/forms/post_form.js
index 9acc56ab4..2e55e685e 100644
--- a/app/assets/javascripts/app/forms/post_form.js
+++ b/app/assets/javascripts/app/forms/post_form.js
@@ -9,7 +9,8 @@ app.forms.Post = app.forms.Base.extend({
    },
 
   formAttrs : {
-    "textarea#text_with_markup" : "text",
+//    "textarea#text_with_markup" : "text",  //fix mentions
+    "textarea.text" : "text",
     "input.aspect_ids" : "aspect_ids",
     "input.service:checked" : "services"
   },
diff --git a/features/step_definitions/trumpeter_steps.rb b/features/step_definitions/trumpeter_steps.rb
index 56d58bc59..f690e6187 100644
--- a/features/step_definitions/trumpeter_steps.rb
+++ b/features/step_definitions/trumpeter_steps.rb
@@ -25,8 +25,8 @@ def finalize_frame
   click_button "done"
 end
 
-def assert_post_renders_with(template_name)
-  find(".post")["data-template"].should == template_name.downcase
+def assert_post_renders_with(mood)
+  find(".post.#{mood.downcase}").should be_present
 end
 
 def find_image_by_filename(filename)
diff --git a/features/trumpeter.feature b/features/trumpeter.feature
index cbeb8a45c..8177c959a 100644
--- a/features/trumpeter.feature
+++ b/features/trumpeter.feature
@@ -29,7 +29,7 @@ Feature: Creating a new post
    And I mention "alice@alice.alice"
    And I go through the default composer
    And I go to "/stream"
-   Then I follow "Alice Smith"
+   Then the first post should mention "Alice Smith"
 
   Scenario: Uploading multiple photos
     When I write "check out these pictures"