diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index be469ff32..76547b8c3 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -284,7 +284,10 @@ module ApplicationHelper
       ":-)"   => "☺",
       "->" => "→",
       "<-" => "←",
-      "..."   => "…"
+      "..."   => "…",
+      "(tm)"  => "™",
+      "(r)"   => "®",
+      "(c)"   => "©"
     }
     
     map.each do |search, replace|
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index d86e64e00..e7433a9e9 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -168,8 +168,8 @@ describe ApplicationHelper do
       end
       
       it "replaces various things with (their) HTML entities" do
-        message = ":) :-) :( :-( ... -> <-"
-        markdownify(message).should == "&#9786; &#9786; &#9785; &#9785; &hellip; &rarr; &larr;"
+        message = ":) :-) :( :-( ... -> <- (tm) (r) (c)"
+        markdownify(message).should == "&#9786; &#9786; &#9785; &#9785; &hellip; &rarr; &larr; &trade; &reg; &copy;"
       end
       
       it "skips doing it if you say so" do