2 files changed, 13 insertions, 6 deletions
diff --git a/app/models/application_mailer.rb b/app/models/application_mailer.rb
index 80f0d7289..044006f7c 100644
--- a/app/models/application_mailer.rb
+++ b/app/models/application_mailer.rb
@@ -9,17 +9,12 @@
 class ApplicationMailer < ActionMailer::Base
     # Include all the functions views get, as emails call similar things.
     helper :application
+    include MailerHelper
 
     # This really should be the default - otherwise you lose any information
     # about the errors, and have to do error checking on return codes.
     self.raise_delivery_errors = true
 
-    def contact_from_name_and_email
-        contact_name = MySociety::Config.get("CONTACT_NAME", 'Alaveteli')
-        contact_email = MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost')
-        return "#{contact_name} <#{contact_email}>"
-    end
-
     def blackhole_email
         MySociety::Config.get("BLACKHOLE_PREFIX", 'do-not-reply-to-this-address')+"@"+MySociety::Config.get("INCOMING_EMAIL_DOMAIN", "localhost")
     end
diff --git a/app/models/contact_mailer.rb b/app/models/contact_mailer.rb
index 74c213c7a..800fe54e4 100644
--- a/app/models/contact_mailer.rb
+++ b/app/models/contact_mailer.rb
@@ -42,4 +42,16 @@ class ContactMailer < ApplicationMailer
         }
     end
 
+    # Send message to a user from the administrator
+    def from_admin_message(recipient_user, subject, message)
+        @from = contact_from_name_and_email
+        @recipients = recipient_user.name_and_email
+        @subject = subject
+        @body = {
+            :message => message,
+            :from_user => @from,
+            :recipient_user => recipient_user,
+        }
+    end
+
 end