diff --git a/src/Fetch/Message.php b/src/Fetch/Message.php
index c8a9d91..770a2af 100644
--- a/src/Fetch/Message.php
+++ b/src/Fetch/Message.php
@@ -18,7 +18,7 @@ namespace Fetch;
  * @package Fetch
  * @author  Robert Hafner <tedivm@tedivm.com>
  */
-class ImapMessage
+class Message
 {
         /**
          * This is the connection/mailbox class that the email came from.
@@ -527,11 +527,11 @@ class ImapMessage
                 $parameters = array();
                 if(isset($structure->parameters))
                         foreach($structure->parameters as $parameter)
-                                $parameters[$parameter->attribute] = $parameter->value;
+                                $parameters[strtolower($parameter->attribute)] = $parameter->value;
 
                 if(isset($structure->dparameters))
                         foreach($structure->dparameters as $parameter)
-                                $parameters[$parameter->attribute] = $parameter->value;
+                                $parameters[strtolower($parameter->attribute)] = $parameter->value;
 
                 return $parameters;
         }
diff --git a/src/Fetch/Server.php b/src/Fetch/Server.php
index 00e0ec8..308329a 100644
--- a/src/Fetch/Server.php
+++ b/src/Fetch/Server.php
@@ -308,7 +308,7 @@ class Server
 
                         return $messages;
                 }else{
-                        false;
+                        return array();
                 }
         }