diff --git a/fetchmail_attach_from_folder/view/fetchmail_server.xml b/fetchmail_attach_from_folder/view/fetchmail_server.xml
index 410ebede7..49384b039 100644
--- a/fetchmail_attach_from_folder/view/fetchmail_server.xml
+++ b/fetchmail_attach_from_folder/view/fetchmail_server.xml
@@ -24,26 +24,27 @@
                                     <field name="match_algorithm" />
                                     <field name="mail_field" />
                                 </tree>
-                                <form col="6">
-                                    <field name="path" />
-                                    <field name="model_id" />
-                                    <field name="model_field" />
-                                    <field name="match_algorithm" />
-                                    <field name="mail_field" />
-                                    <newline />
-                                    <field name="delete_matching" />
-                                    <field name="flag_nonmatching" />
-                                    <field name="match_first" />
-                                    <field name="msg_state" />
-                                    <field name="model_order" attrs="{'readonly': [('match_first','==',False)], 'required': [('match_first','==',True)]}" />
-                                    <field name="domain" />
-                                    <newline />
-                                    <label />
-                                    <label />
-                                    <label />
-                                    <label />
-                                    <label />
-                                    <button type="object" name="button_attach_mail_manually" string="Attach mail manually" icon="gtk-redo" />
+                                <form version="7.0">
+                                    <header>
+                                        <button type="object" name="button_attach_mail_manually" string="Attach mail manually" icon="gtk-redo" />
+                                    </header>
+                                    <group>
+                                        <group>
+                                            <field name="path" />
+                                            <field name="model_id" />
+                                            <field name="model_field" />
+                                            <field name="match_algorithm" />
+                                            <field name="mail_field" />
+                                        </group>
+                                        <group>
+                                            <field name="delete_matching" />
+                                            <field name="flag_nonmatching" />
+                                            <field name="match_first" />
+                                            <field name="msg_state" />
+                                            <field name="model_order" attrs="{'readonly': [('match_first','==',False)], 'required': [('match_first','==',True)]}" />
+                                            <field name="domain" />
+                                        </group>
+                                    </group>
                                 </form>
                             </field>
                         </group>
diff --git a/fetchmail_attach_from_folder/wizard/attach_mail_manually.py b/fetchmail_attach_from_folder/wizard/attach_mail_manually.py
index 86fadbf62..d1a16fa1f 100644
--- a/fetchmail_attach_from_folder/wizard/attach_mail_manually.py
+++ b/fetchmail_attach_from_folder/wizard/attach_mail_manually.py
@@ -85,8 +85,10 @@ class attach_mail_manually(TransientModel):
                         msgid, folder.path, this.server)) 
                     continue 
                 
-                mail_message = self.pool.get('mail.message').parse_message( 
-                        msgdata[0][1], this.folder_id.server_id.original)
+                mail_message = self.pool.get('mail.thread').message_parse(
+                    cr, uid, msgdata[0][1],
+                    save_original=this.folder_id.server_id.original,
+                    context=context)
 
                 this.folder_id.server_id.attach_mail(connection, 
                         mail.object_id.id, this.folder_id, mail_message, 
diff --git a/fetchmail_attach_from_folder/wizard/attach_mail_manually.xml b/fetchmail_attach_from_folder/wizard/attach_mail_manually.xml
index d33e7b653..fbe82eea7 100644
--- a/fetchmail_attach_from_folder/wizard/attach_mail_manually.xml
+++ b/fetchmail_attach_from_folder/wizard/attach_mail_manually.xml
@@ -6,20 +6,22 @@
             <field name="model">fetchmail.attach.mail.manually</field>
             <field name="arch" type="xml">
                 <form col="4" version="7.0" string="Attach mail manually">
-                    <group>
-                        <field name="folder_id" />
-                        <field name="mail_ids" nolabel="1" colspan="4">
-                            <tree editable="top">
-                                <field name="subject" />
-                                <field name="date" />
-                                <field name="object_id" />
-                            </tree>
-                        </field>
-                        <label string="" />
-                        <label string="" />
-                        <button special="cancel" string="Cancel" icon="gtk-cancel" />
+                    <sheet>
+                        <group>
+                            <field name="folder_id" />
+                            <field name="mail_ids" nolabel="1" colspan="4">
+                                <tree editable="top" create="0">
+                                    <field name="subject" />
+                                    <field name="date" />
+                                    <field name="object_id" />
+                                </tree>
+                            </field>
+                        </group>
+                    </sheet>
+                    <footer>
                         <button string="Save" type="object" name="attach_mails" icon="gtk-ok" />
-                    </group>
+                        <button special="cancel" string="Cancel" icon="gtk-cancel" />
+                    </footer>
                 </form>
             </field>
         </record>