Revert bad diff

lib/email/message_builder.rb

@@ -49,7 +49,7 @@ module Email
       return unless html_override = @opts[:html_override]
       if @opts[:add_unsubscribe_link]
 
-        if response_instructions = @opts[:respond_instructions]
+        if response_instructions = @template_args[:respond_instructions]
           respond_instructions = PrettyText.cook(response_instructions).html_safe
           html_override.gsub!("%{respond_instructions}", respond_instructions)
         end

lib/email/receiver.rb

@@ -67,19 +67,6 @@ module Email
       end
     end
 
-    def is_in_email?
-      @allow_strangers = false
-      return false unless SiteSetting.email_in
-
-      category = Category.find_by_email(@message.to.first)
-      return false unless category
-
-      @category_id = category.id
-      @allow_strangers = category.email_in_allow_strangers
-
-      true
-    end
-
     private
 
     def parse_body
@@ -148,6 +135,19 @@ module Email
       @body.strip!
     end
 
+    def is_in_email?
+      @allow_strangers = false
+      return false unless SiteSetting.email_in
+
+      category = Category.find_by_email(@message.to.first)
+      return false unless category
+
+      @category_id = category.id
+      @allow_strangers = category.email_in_allow_strangers
+
+      true
+    end
+
     def wrap_body_in_quote
       @body = "[quote=\"#{@message.from.first}\"]
 #{@body}