diff --git a/app/models/service.rb b/app/models/service.rb
index 9cd0979e9..fc6364588 100644
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -10,7 +10,7 @@ class Service < ActiveRecord::Base
   def public_message(post, length, url = "")
     url = "" if post.respond_to?(:photos) && post.photos.count == 0
     space_for_url = url.blank? ? 0 : (url.length + 1)
-    truncated = truncate(post.message, :length => (length - space_for_url))
+    truncated = truncate(post.message(:plain_text => true), :length => (length - space_for_url))
     truncated = "#{truncated} #{url}" unless url.blank?
     return truncated
   end
diff --git a/app/models/status_message.rb b/app/models/status_message.rb
index 237babf55..c70f8fbe7 100644
--- a/app/models/status_message.rb
+++ b/app/models/status_message.rb
@@ -22,8 +22,8 @@ class StatusMessage < Post
     get_youtube_title message
   end
 
-  def message
-    self.formatted_message
+  def message(opts = {})
+    self.formatted_message(opts)
   end
 
   def raw_message