(rmail-set-label): Delete the keyword header if all labels are

removed.  (Bug#2302)

1 files changed, 3 insertions, 1 deletions

diff --git a/lisp/mail/rmailkwd.el b/lisp/mail/rmailkwd.el
index 687837ac56f..001249a222d 100644
--- a/lisp/mail/rmailkwd.el
+++ b/lisp/mail/rmailkwd.el
@@ -127,7 +127,9 @@ LABEL may be a symbol or string."
                                        (min (length header)
                                             (- (match-end 0) 1)))))
                  (cond ((string= before "")
-                        after)
+                        ;; If before and after both empty, delete the header.
+                        (unless (string= after "")
+                          after))
                        ((string= after "")
                         before)
                        (t (concat before ", " after))))))))))