3 files changed, 7 insertions, 9 deletions
diff --git a/lib/mail_handler/backends/tmail_backend.rb b/lib/mail_handler/backends/tmail_backend.rb
index 2f59b1161..fc675c1ed 100644
--- a/lib/mail_handler/backends/tmail_backend.rb
+++ b/lib/mail_handler/backends/tmail_backend.rb
@@ -1,12 +1,3 @@
-# Monkeypatch! Adding some extra members to store extra info in.
-module TMail
-    class Mail
-        attr_accessor :url_part_number
-        attr_accessor :rfc822_attachment # when a whole email message is attached as text
-        attr_accessor :within_rfc822_attachment # for parts within a message attached as text (for getting subject mainly)
-    end
-end
-
 module MailHandler
     module Backends
         module TmailBackend
diff --git a/lib/tmail_extensions.rb b/lib/mail_handler/backends/tmail_extensions.rb
index 6a533e658..bc994b9f3 100644
--- a/lib/tmail_extensions.rb
+++ b/lib/mail_handler/backends/tmail_extensions.rb
@@ -15,6 +15,12 @@ require 'tmail/interface'
 # These mainly used in app/models/incoming_message.rb
 module TMail
     class Mail
+        # Monkeypatch! Adding some extra members to store extra info in.
+
+        attr_accessor :url_part_number
+        attr_accessor :rfc822_attachment # when a whole email message is attached as text
+        attr_accessor :within_rfc822_attachment # for parts within a message attached as text (for getting subject mainly)
+
         # Monkeypatch! (check to see if this becomes a standard function in
         # TMail::Mail, then use that, whatever it is called)
         def Mail.get_part_file_name(part)
diff --git a/lib/mail_handler/mail_handler.rb b/lib/mail_handler/mail_handler.rb
index 5db17ae77..f0c75670a 100644
--- a/lib/mail_handler/mail_handler.rb
+++ b/lib/mail_handler/mail_handler.rb
@@ -5,6 +5,7 @@ module MailHandler
         require 'backends/mail_backend'
         include Backends::MailBackend
     else
+        require 'backends/tmail_extensions'
         require 'backends/tmail_backend'
         include Backends::TmailBackend
     end