Do not fetch mail message for every call to it

dcparker · Mar 12, 2014 · d9e218b · d9e218b
1 parent 2ae0827
commit d9e218b
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/lib/gmail/message.rb b/lib/gmail/message.rb
@@ -84,15 +84,19 @@ def archive!
 
     # Parsed MIME message object
     def message
-      require 'mail'
-      request,part = 'RFC822','RFC822'
-      request,part = 'BODY.PEEK[]','BODY[]' if @gmail.peek
-      _body = @gmail.in_mailbox(@mailbox) { @gmail.imap.uid_fetch(uid, request)[0].attr[part] }
-      @message ||= Mail.new(_body)
+      if @message
+        return @message
+      else
+        require 'mail'
+        request,part = 'RFC822','RFC822'
+        request,part = 'BODY.PEEK[]','BODY[]' if @gmail.peek
+        _body = @gmail.in_mailbox(@mailbox) { @gmail.imap.uid_fetch(uid, request)[0].attr[part] }
+        @message = Mail.new(_body)
+      end
     end
 
     private
-    
+
     # Delegate all other methods to the Mail message
     def method_missing(*args, &block)
       if block_given?