diff --git a/spam/edit_white.cgi b/spam/edit_white.cgi
index c6b368964..d92244483 100755
--- a/spam/edit_white.cgi
+++ b/spam/edit_white.cgi
@@ -28,13 +28,13 @@ print &ui_table_start(undef, undef, 2);
 
 # Addresses to always whitelist
 @from = &find("whitelist_from", $conf);
-print &ui_table_row($text{'white_from'},
+print &ui_table_row(&hlink($text{'white_from'}, 'white_from'),
 	&edit_textbox("whitelist_from",
 		      [ map { @{$_->{'words'}} } @from ], 60, 10));
 
 # Exceptions to whitelist
 @un = &find("unwhitelist_from", $conf);
-print &ui_table_row($text{'white_unfrom'},
+print &ui_table_row(&hlink($text{'white_unfrom'}, 'white_unfrom'),
 	&edit_textbox("unwhitelist_from",
 		      [ map { @{$_->{'words'}} } @un ], 60, 5));
 
@@ -54,7 +54,7 @@ if ($config{'show_global'}) {
 
 # Whitelist by received header
 @rcvd = &find("whitelist_from_rcvd", $conf);
-print &ui_table_row($text{'white_rcvd2'},
+print &ui_table_row(&hlink($text{'white_rcvd2'}, 'white_rcvd2'),
 	&edit_table("whitelist_from_rcvd",
 		[ $text{'white_addr'}, $text{'white_rcvdhost'} ],
 		[ map { $_->{'words'} } @rcvd ], [ 40, 30 ], undef, 3));
diff --git a/spam/help/white_from.html b/spam/help/white_from.html
new file mode 100644
index 000000000..4085c2b73
--- /dev/null
+++ b/spam/help/white_from.html
@@ -0,0 +1,10 @@
+<header>Senders to never classify as spam (whitelist_from)</header>
+
+Used to whitelist sender addresses which send mail that is often tagged (incorrectly) as spam. <p>
+
+Use of this setting is not recommended, since it blindly trusts the message, which is routinely and easily forged by spammers and phish senders. <p>
+
+The recommended solution is to instead use whitelist_auth or other authenticated whitelisting methods, or whitelist_from_rcvd. <p>
+
+<footer>
+
diff --git a/spam/help/white_rcvd2.html b/spam/help/white_rcvd2.html
new file mode 100644
index 000000000..8b25e071d
--- /dev/null
+++ b/spam/help/white_rcvd2.html
@@ -0,0 +1,5 @@
+<header>Sender to never classify as spam (whitelist_from_rcvd)</header>
+
+Use this to supplement the allowed sender addresses with a check against the Received headers. The first parameter is the address to whitelist, and the second is a string to match the relay's rDNS. <p>
+
+<footer>
diff --git a/spam/help/white_unfrom.html b/spam/help/white_unfrom.html
new file mode 100644
index 000000000..11e417d90
--- /dev/null
+++ b/spam/help/white_unfrom.html
@@ -0,0 +1,6 @@
+<header>Exceptions for senders to never classify as spam (unwhitelist_from)</header>
+
+Used to override an sender to never classify as spam, for example to be more
+specific or to block an address that is allowed globally. <p>
+
+<footer>