diff --git a/plugins/help/skins/classic/templates/help.html b/plugins/help/skins/classic/templates/help.html
index 98beb6655..2e430ecf3 100644
--- a/plugins/help/skins/classic/templates/help.html
+++ b/plugins/help/skins/classic/templates/help.html
@@ -4,7 +4,6 @@
 <title><roundcube:object name="pagetitle" /></title>
 <roundcube:include file="/includes/links.html" />
 <link rel="stylesheet" type="text/css" href="/this/help.css" />
-<link rel="stylesheet" type="text/css" href="/settings.css" />
 <script type="text/javascript">
 function help_init_settings_tabs()
 {
@@ -13,7 +12,7 @@ function help_init_settings_tabs()
 	    tab = '#helptab' + (action ? action : 'default');
     }
     $(tab).addClass('tablink-selected');
-}	       
+}
 </script>
 </head>
 <body>
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 9ad3a6e6f..10829d514 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1247,7 +1247,7 @@ function rcmail_part_image_type($part)
 
   if ($part->filename
     && preg_match('/^application\/octet-stream$/i', $part->mimetype)
-    && preg_match('/\.([^.])$/i', $part->filename, $m)
+    && preg_match('/\.([^.]+)$/i', $part->filename, $m)
     && ($extension = strtolower($m[1]))
     && isset($types[$extension])
   ) {
