diff --git a/Lib/email/Parser.py b/Lib/email/Parser.py
index cb994ba..9add442 100644
--- a/Lib/email/Parser.py
+++ b/Lib/email/Parser.py
@@ -8,9 +8,8 @@
 from cStringIO import StringIO
 from types import ListType
 
-# Intrapackage imports
-import Errors
-import Message
+from email import Errors
+from email import Message
 
 EMPTYSTRING = ''
 NL = '\n'
@@ -176,7 +175,7 @@
             except Errors.HeaderParseError:
                 msg = self._class()
                 self._parsebody(msg, fp)
-            container.set_payload(msg)
+            container.attach(msg)
         else:
             container.set_payload(fp.read())