1 files changed, 9 insertions, 2 deletions
diff --git a/password.php b/password.php
index 0be971964..f5ee6b2f8 100644
--- a/password.php
+++ b/password.php
@@ -52,8 +52,15 @@ function pwg_mail($to, $from, $infos = '')
   
   $content = $infos;
   $content.= "\n\n-- \nPhpWebGallery ".PHPWG_VERSION;
-  
-  return mail($to, $subject, $content, $headers, $options);
+
+  if ($conf['mail_options'])
+  {
+    return mail($to, $subject, $content, $headers, $options);
+  }
+  else
+  {
+    return mail($to, $subject, $content, $headers);
+  }
 }
 
 // +-----------------------------------------------------------------------+