diff --git a/app/models/services/twitter.rb b/app/models/services/twitter.rb
index 243536c7..b27720a9 100644
--- a/app/models/services/twitter.rb
+++ b/app/models/services/twitter.rb
@@ -28,7 +28,7 @@ class Services::Twitter < Service
 
     def prepare_tweet(answer)
       # TODO: improve this.
-      question_content = twitter_markdown answer.question.content
+      question_content = twitter_markdown answer.question.content.gsub(/\@(\w+)/, '\1')
       answer_content = twitter_markdown answer.content
       answer_url = show_user_answer_url(
         id: answer.id,
@@ -39,4 +39,4 @@ class Services::Twitter < Service
       "#{question_content[0..54]}#{'…' if question_content.length > 55}" \
         " — #{answer_content[0..55]}#{'…' if answer_content.length > 56} #{answer_url}"
     end
-end
\ No newline at end of file
+end