Cherry-pick the following two changes from the upstream Git repository
at http://git.savannah.gnu.org/cgit/mailutils.git:
018df5d628f4e093f7e45c00b48ffc11b234d8cf - Minor fix 113e144dedbebb5bc659eadc7f329450bb374606 - Fix mandatory locking
Requested by: maintainer