merge trunk r1320:1321 into branch 1.6

git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1322 68402e56-0260-453c-a942-63ccdbb3a9ee

include/functions_mail.inc.php

@@ -122,10 +122,6 @@ function pwg_mail($to, $from = '', $subject = 'PhpWebGallery', $infos = '')
   $content = $infos;
   $content.= $conf_mail['text_footer'];
 
-  // Convert Text on HTML format to raw text format
-  $subject = html_entity_decode($subject);
-  $content = html_entity_decode($content);
-
   if ($conf_mail['mail_options'])
   {
     $options = '-f '.$from;
@@ -138,4 +134,4 @@ function pwg_mail($to, $from = '', $subject = 'PhpWebGallery', $infos = '')
   }
 }
 
-?>
+?>