diff --git a/Text/ParserCombinators/Parsec/Rfc2822.hs b/Text/ParserCombinators/Parsec/Rfc2822.hs
--- a/Text/ParserCombinators/Parsec/Rfc2822.hs
+++ b/Text/ParserCombinators/Parsec/Rfc2822.hs
@@ -542,9 +542,8 @@
 -- represented in the 'Field' data type, and a message body, which may
 -- be empty.
 
-data Message
-    = Message [Field] String
-      deriving (Show)
+data GenericMessage a = Message [Field] a
+type Message = GenericMessage String
 
 -- |Parse a complete message as defined by this RFC and it broken down
 -- into the separate header fields and the message body. Header lines,
diff --git a/hsemail.cabal b/hsemail.cabal
--- a/hsemail.cabal
+++ b/hsemail.cabal
@@ -1,9 +1,9 @@
 Name:                   hsemail
-Version:                1.4
+Version:                1.5
 Copyright:              (c) 2004-2010 Peter Simons
 License:                BSD3
 License-File:           LICENSE
-Author:                 Peter Simons <simons@cryp.to>
+Author:                 Peter Simons <simons@cryp.to>, Gero Kriependorf <gero@physra.com>, Marty Pauley <marty@kasei.com>
 Maintainer:             Peter Simons <simons@cryp.to>
 Homepage:               http://gitorious.org/hsemail
 Category:               Parsing
@@ -17,11 +17,6 @@
                         example/message-test.input
                         example/smtp-test.hs
                         example/smtp-test.input
-
-Source-Repository this
-  Tag:                  v1.4
-  Type:                 git
-  Location:             git://gitorious.org/hsemail/mainline.git
 
 Source-Repository head
   Type:                 git