Add filter criteria to Mailbox.gen_messages