diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 8b871c8..ae96fbf 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -4,9 +4,10 @@ class UserMailer < ActionMailer::Base
 
   def new_comment_email(user, comment)
     @comment = comment
-    @author = comment.user
+    @author = UserDecorator.new(comment.user)
     @asciicast = AsciicastDecorator.new(@comment.asciicast)
 
+    user = UserDecorator.new(user)
     to = "~#{user.nickname} <#{user.email}>"
     subject = %(New comment for #{@asciicast.title})
     mail :to => to, :subject => subject