diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index b1ab294d4..2d762f40a 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -288,7 +288,7 @@ en:
     private_message: "sent you a message."
     comment_on_post: "commented on your"
     also_commented: "also commented on %{post_author}'s"
-    mentioned: "has mentioned you in their"
+    mentioned: "has mentioned you in a post"
     post: "post"
     deleted: "deleted"
     also_commented_deleted: "commented on a deleted post"
diff --git a/db/schema.rb b/db/schema.rb
index 5084d2381..7eed97e03 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -339,6 +339,8 @@ ActiveRecord::Schema.define(:version => 20110406203720) do
     t.string "name"
   end
 
+  add_index "tags", ["name"], :name => "index_tags_on_name", :unique => true
+
   create_table "user_preferences", :force => true do |t|
     t.string   "email_type"
     t.integer  "user_id"