1 files changed, 11 insertions, 8 deletions
diff --git a/app/models/outgoing_message.rb b/app/models/outgoing_message.rb
index 2e98e1021..23b5c904b 100644
--- a/app/models/outgoing_message.rb
+++ b/app/models/outgoing_message.rb
@@ -50,6 +50,8 @@ class OutgoingMessage < ActiveRecord::Base
         end
     end
 
+    after_initialize :set_default_letter
+
     # How the default letter starts and ends
     def get_salutation
         ret = ""
@@ -129,13 +131,6 @@ class OutgoingMessage < ActiveRecord::Base
         MySociety::Validate.contains_postcode?(self.body)
     end
 
-    # Set default letter
-    def after_initialize
-        if self.body.nil?
-            self.body = get_default_message
-        end
-    end
-
     # Check have edited letter
     def validate
         if self.body.empty? || self.body =~ /\A#{get_salutation}\s+#{get_signoff}/ || self.body =~ /#{get_internal_review_insert_here_note}/
@@ -252,7 +247,7 @@ class OutgoingMessage < ActiveRecord::Base
         text = MySociety::Format.make_clickable(text, :contract => 1)
         text.gsub!(/\[(email address|mobile number)\]/, '[<a href="/help/officers#mobiles">\1</a>]')
         text = text.gsub(/\n/, '<br>')
-        return text
+        return text.html_safe
     end
 
     def fully_destroy
@@ -275,6 +270,14 @@ class OutgoingMessage < ActiveRecord::Base
             yield(column.human_name, self.send(column.name), column.type.to_s, column.name)
         end
     end
+
+    private
+
+    def set_default_letter
+        if self.body.nil?
+            self.body = get_default_message
+        end
+    end
 end