diff --git a/src/freedombone-addemail b/src/freedombone-addemail
index 606e2728..24a784b3 100755
--- a/src/freedombone-addemail
+++ b/src/freedombone-addemail
@@ -82,10 +82,10 @@ if [ ! -d "$LISTDIR" ]; then
     mkdir -m 700 $LISTDIR/cur
 fi
 chown -R $MYUSERNAME:$MYUSERNAME $LISTDIR
-if ! grep -q "From: $EMAILADDRESS" $PM; then
+if ! grep -q "Email rule for $EMAILADDRESS -> $MAILINGLIST" $PM; then
     echo "# Email rule for $EMAILADDRESS -> $MAILINGLIST" >> $PM
     echo ":0" >> $PM
-    echo "  * ^From: $EMAILADDRESS" >> $PM
+    echo "  * ^From:.*$EMAILADDRESS" >> $PM
     echo "$LISTDIR/new" >> $PM
     echo "# End of rule" >> $PM
     chown $MYUSERNAME:$MYUSERNAME $PM
diff --git a/src/freedombone-ignore b/src/freedombone-ignore
index a478d627..bfe2194d 100755
--- a/src/freedombone-ignore
+++ b/src/freedombone-ignore
@@ -94,7 +94,7 @@ if [ $EMAIL_ADDRESS ]; then
     if ! grep -q "Ignore rule for $EMAIL_ADDRESS" $PM; then
         echo "# Ignore rule for $EMAIL_ADDRESS" >> $PM
         echo ":0" >> $PM
-        echo "  * ^From: $EMAIL_ADDRESS" >> $PM
+        echo "  * ^From:.*$EMAIL_ADDRESS" >> $PM
         echo "/dev/null" >> $PM
         echo "# End of ignore rule" >> $PM
         chown $MYUSERNAME:$MYUSERNAME $PM