Index: trunk/roundcubemail/program/steps/mail/attachments.inc
===================================================================
--- trunk/roundcubemail/program/steps/mail/attachments.inc	(revision 2401)
+++ trunk/roundcubemail/program/steps/mail/attachments.inc	(revision 2431)
@@ -80,8 +80,9 @@
       'path' => $filepath,
       'name' => $_FILES['_attachments']['name'][$i],
-      'mimetype' => rc_mime_content_type($tmpfname, $_FILES['_attachments']['type'][$i])
+      'mimetype' => rc_mime_content_type($filepath, $_FILES['_attachments']['type'][$i])
     );
 
     $attachment = $RCMAIL->plugins->exec_hook('upload_attachment', $attachment);
+
     if ($attachment['status']) {
       $id = $attachment['id'];
@@ -94,6 +95,5 @@
         $button = html::img(array(
           'src' => $icon,
-          'alt' => rcube_label('delete'),
-          'style' => "padding-right:2px;vertical-align:middle",
+          'alt' => rcube_label('delete')
         ));
       }