FIX: use email_site_title for emails like reset password and account activation too

lib/email/message_builder.rb

@@ -163,8 +163,12 @@ module Email
     end
 
     def alias_email(source)
-      return source if @opts[:from_alias].blank?
-      "#{@opts[:from_alias]} <#{source}>"
+      return source if @opts[:from_alias].blank? && SiteSetting.email_site_title.blank?
+      if !@opts[:from_alias].blank?
+        "#{@opts[:from_alias]} <#{source}>"
+      else
+        "#{SiteSetting.email_site_title} <#{source}>"
+      end
     end
 
     def site_alias_email(source)

spec/components/email/message_builder_spec.rb

@@ -242,6 +242,11 @@ describe Email::MessageBuilder do
       expect(custom_aliased_from.build_args[:from]).to eq("Finn the Dog <#{finn_email}>")
     end
 
+    it "email_site_title will be added if it's set" do
+      SiteSetting.stubs(:email_site_title).returns("The Forum")
+      expect(build_args[:from]).to eq("The Forum <#{SiteSetting.notification_email}>")
+    end
+
   end
 
 end