Don't drop fields whose decision has been forced.
Don't drop fields whose decision has been forced.

--HG--
branch : HEAD

jwm/dovecot-notmuch,jkerihuel/dovecot,jkerihuel/dovecot,jwm/dovecot-notmuch,jkerihuel/dovecot,jwm/dovecot-notmuch,jkerihuel/dovecot,jwm/dovecot-notmuch,jkerihuel/dovecot,jwm/dovecot-notmuch