diff --git a/help/C/usage-mail-org.sgml b/help/C/usage-mail-org.sgml
index e933d6a033..548759f092 100644
--- a/help/C/usage-mail-org.sgml
+++ b/help/C/usage-mail-org.sgml
@@ -657,6 +657,15 @@
 	      Set Status - If you want to add multiple actions for this filter, press
 	      <guibutton>Add filter</guibutton> and repeat the previous step.
 	    </para>
+            <note>
+              <para>
+                If you wish to set status while moving an email to a
+                different folder at the same time, you will need to
+                tell <application>Ximian Evolution</application> to
+                set status before you move the message to another
+                folder.
+              </para>
+            </note>
 	  </listitem>
 	  <listitem>
 	    <para>
diff --git a/help/ChangeLog b/help/ChangeLog
index f5e3b4e7ab..eccb4a93d0 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-09  Kevin Breit  <mrproper@ximian.com>
+
+	* C/usage-mail-org.sgml: Added note about set status filter action.
+
 2002-06-28  Aaron Weber  <aaron@ximian.com>
 
 	* C/usage-exec-summary.sgml: change menu item links.