Use Mail gem over RMail

lib/sup.rb

@@ -7,7 +7,7 @@
 require 'fileutils'
 require 'locale'
 require 'ncursesw'
-require 'rmail'
+require 'mail'
 begin
   require 'fastthread'
 rescue LoadError

lib/sup/crypto.rb

@@ -57,6 +57,7 @@ def initialize
     @mutex = Mutex.new
 
     @not_working_reason = nil
+    @not_working_reason = "The crypto code needs to be ported to use Mail not RMail"
 
     # test if the gpgme gem is available
     @gpgme_present =

lib/sup/index.rb

@@ -123,8 +123,9 @@ def load_index failsafe=false
       if false
         info "Upgrading index format #{db_version} to #{INDEX_VERSION}"
         @xapian.set_metadata 'version', INDEX_VERSION
+
       elsif db_version != INDEX_VERSION
-        fail "This Sup version expects a v#{INDEX_VERSION} index, but you have an existing v#{db_version} index. Please run sup-dump to save your labels, move #{path} out of the way, and run sup-sync --restore."
+        fail "This Sup version expects a v#{INDEX_VERSION} index, but you have an existing v#{db_version} index. Please run sup-dump to save your labels, move #{path} out of the way, and run sup-sync --restore." unless failsafe
       end
     else
       @xapian = Xapian::WritableDatabase.new(path, Xapian::DB_CREATE)

lib/sup/maildir.rb

@@ -81,7 +81,13 @@ def load_header id
   end
 
   def load_message id
-    with_file_for(id) { |f| RMail::Parser.read f }
+    with_file_for(id) do |f|
+      begin
+        Mail.read_from_string f.read
+      rescue
+        raise SourceError
+      end
+    end
   end
 
   def sync_back id, labels

lib/sup/mbox.rb

@@ -81,8 +81,8 @@ def load_message offset
         until @f.eof? || MBox::is_break_line?(l = @f.gets)
           string << l
         end
-        RMail::Parser.read string
-      rescue RMail::Parser::Error => e
+        Mail.read_from_string string
+      rescue e
         raise FatalSourceError, "error parsing mbox file: #{e.message}"
       end
     end