- fix attachment mimetype setting after upload

- move style of delete button in attachment-list to mail.css file

3 files changed, 11 insertions, 5 deletions

diff --git a/program/steps/mail/attachments.inc b/program/steps/mail/attachments.inc
index 6d58edc8e..81ac2fe5c 100644
--- a/program/steps/mail/attachments.inc
+++ b/program/steps/mail/attachments.inc
@@ -79,10 +79,11 @@ if (is_array($_FILES['_attachments']['tmp_name'])) {
     $attachment = array(
       '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'];
       
@@ -93,8 +94,7 @@ if (is_array($_FILES['_attachments']['tmp_name'])) {
       if (is_file($icon = $CONFIG['skin_path'] . '/images/icons/remove-attachment.png')) {
         $button = html::img(array(
           'src' => $icon,
-          'alt' => rcube_label('delete'),
-          'style' => "padding-right:2px;vertical-align:middle",
+          'alt' => rcube_label('delete')
         ));
       }
       else {
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 9739a9772..9328cc5ac 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -715,8 +715,8 @@ function rcmail_compose_attachment_list($attrib)
     if ($attrib['deleteicon'])
       $button = html::img(array(
         'src' => $CONFIG['skin_path'] . $attrib['deleteicon'],
-        'alt' => rcube_label('delete'),
-        'style' => "padding-right:2px;vertical-align:middle"));
+        'alt' => rcube_label('delete')
+	));
     else
       $button = Q(rcube_label('delete'));
 
diff --git a/skins/default/mail.css b/skins/default/mail.css
index ab4579eb9..c66998dd9 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -1016,6 +1016,12 @@ div.message-htmlpart div.rcmBody
   overflow: hidden;
 }
 
+#compose-attachments ul li img
+{
+  padding-right: 2px;
+  vertical-align: middle;
+}
+
 #attachment-title
 {
   background: url(images/icons/attachment.png) top left no-repeat;