1 files changed, 2 insertions, 1 deletions
diff --git a/inc/Mailer.class.php b/inc/Mailer.class.php
index c85e61395..f1492be9b 100644
--- a/inc/Mailer.class.php
+++ b/inc/Mailer.class.php
@@ -69,7 +69,7 @@ class Mailer {
      */
     public function attachFile($path, $mime, $name = '', $embed = '') {
         if(!$name) {
-            $name = basename($path);
+            $name = utf8_basename($path);
         }
 
         $this->attach[] = array(
@@ -555,6 +555,7 @@ class Mailer {
     protected function prepareHeaders() {
         $headers = '';
         foreach($this->headers as $key => $val) {
+            if ($val === '') continue;
             $headers .= "$key: $val".MAILHEADER_EOL;
         }
         return $headers;