diff --git a/app/views/layouts/notifier.html.erb b/app/views/layouts/user_mailer.html.erb
similarity index 100%
rename from app/views/layouts/notifier.html.erb
rename to app/views/layouts/user_mailer.html.erb
diff --git a/test/mailers/user_mailer_test.rb b/test/mailers/user_mailer_test.rb
new file mode 100644
index 0000000000..23136951cf
--- /dev/null
+++ b/test/mailers/user_mailer_test.rb
@@ -0,0 +1,9 @@
+require "test_helper"
+
+class UserMailerTest < ActionMailer::TestCase
+ def test_html_layout_is_used
+ email = UserMailer.message_notification(create(:message))
+
+ assert_match(/