3 files changed, 5 insertions, 15 deletions
diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb
index 6b6a8525e..1de63be59 100644
--- a/app/controllers/admin_request_controller.rb
+++ b/app/controllers/admin_request_controller.rb
@@ -207,8 +207,7 @@ class AdminRequestController < AdminController
                 end
 
                 raw_email_data = incoming_message.raw_email.data
-                mail = TMail::Mail.parse(raw_email_data)
-                mail.base64_decode
+                mail = MailHandler.mail_from_raw_email(raw_email_data)
                 destination_request.receive(mail, raw_email_data, true)
 
                 incoming_message_id = incoming_message.id
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 3f3c169ae..f9649c868 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -117,17 +117,14 @@ class ApplicationController < ActionController::Base
 
     # Override default error handler, for production sites.
     def rescue_action_in_public(exception)
-        # Call `set_view_paths` from the theme, if it exists.
+        # Looks for before_filters called something like `set_view_paths_{themename}`. These
+        # are set by the themes.
         # Normally, this is called by the theme itself in a
         # :before_filter, but when there's an error, this doesn't
         # happen.  By calling it here, we can ensure error pages are
         # still styled according to the theme.
-        begin
-            set_view_paths
-        rescue NameError => e
-            if !(e.message =~ /undefined local variable or method `set_view_paths'/)
-                raise
-            end
+        ActionController::Base.before_filters.select{|f| f.to_s =~ /set_view_paths/}.each do |f|
+            self.send(f)
         end
         # Make sure expiry time for session is set (before_filters are
         # otherwise missed by this override)
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb
index 0cde238cd..3ba636e29 100644
--- a/app/controllers/general_controller.rb
+++ b/app/controllers/general_controller.rb
@@ -226,12 +226,6 @@ class GeneralController < ApplicationController
         redirect_to request_url(info_request)
     end
 
-    # For debugging
-    def fai_test
-        sleep 10
-        render :text => "awake\n"
-    end
-
     def custom_css
         long_cache
         @locale = self.locale_from_params()