--- /tmp/mailbox.php	2008-01-25 15:57:18.000000000 -0500
+++ mailbox.php	2008-01-25 15:57:32.000000000 -0500
@@ -524,5 +524,5 @@
 
     if ($conf['spam']['reporting'] &&
-        ($conf['spam']['spamfolder'] ||
+        (!$conf['spam']['spamfolder'] ||
          ($imp_mbox['mailbox'] != IMP::folderPref($prefs->getValue('spam_folder'), true)))) {
         $a_template->set('spam', Horde::widget('#', _("Report as Spam"), 'widget', '', "messages_submit('spam_report'); return false;", _("Report as Spam")));
--- /tmp/message.php	2008-01-25 15:57:18.000000000 -0500
+++ message.php	2008-01-25 15:57:40.000000000 -0500
@@ -590,5 +590,5 @@
 
     if ($conf['spam']['reporting'] &&
-        ($conf['spam']['spamfolder'] ||
+        (!$conf['spam']['spamfolder'] ||
          ($mailbox_name != IMP::folderPref($prefs->getValue('spam_folder'), true)))) {
         $a_template->set('spam', Horde::widget('#', _("Report as Spam"), 'widget', '', "message_submit('spam_report'); return false;", _("Report as Spam"), true));
