Made Message.message only query the server once per message

Especially if I am leveraging method_missing and calling messages that
get delegated to Mail message, I don't want to query the server for
every argument.

Author: scockram

lib/gmail/message.rb

@@ -1,3 +1,5 @@
+require 'mail'
+
 class Gmail
   class Message
     def initialize(gmail, mailbox, uid)
@@ -89,11 +91,12 @@ 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)
+      request, part = if @gmail.peek 
+                        ['BODY.PEEK[]', 'BODY[]']
+                      else
+                        ['RFC822', 'RFC822']
+                      end
+      @message ||= Mail.new(@gmail.imap.uid_fetch(uid, request)[0].attr[part])
     end
 
     private