Changes to mbox.c, mbox.h