diff --git a/plugins/phorum/Changelog b/plugins/phorum/Changelog
index b0e00725..9420f6dd 100644
--- a/plugins/phorum/Changelog
+++ b/plugins/phorum/Changelog
@@ -9,6 +9,9 @@ Changelog                                         HTMLPurifier : Phorum Mod
     . Internal change
 ==========================
 
+Version 3.0.0.1 for Phorum 5.2, unknown release date
+- Fixed double encoded quotes
+
 Version 3.0.0 for Phorum 5.2, released January 12, 2008
 # WYSIWYG and suppress_message options are now configurable via web
   interface.
diff --git a/plugins/phorum/htmlpurifier.php b/plugins/phorum/htmlpurifier.php
index 512280bd..26d78a1d 100644
--- a/plugins/phorum/htmlpurifier.php
+++ b/plugins/phorum/htmlpurifier.php
@@ -88,7 +88,7 @@ function phorum_htmlpurifier_format($data)
                 $body = $message['body'];
                 // order is important
                 $body = str_replace("<phorum break>\n", "\n", $body);
-                $body = str_replace(array('&lt;','&gt;','&amp;'), array('<','>','&'), $body);
+                $body = str_replace(array('&lt;','&gt;','&amp;', '&quot;'), array('<','>','&','"'), $body);
                 if (!$message_id && defined('PHORUM_CONTROL_CENTER')) {
                     // we're in control.php, so it was double-escaped
                     $body = str_replace(array('&lt;','&gt;','&amp;', '&quot;'), array('<','>','&','"'), $body);