rename to deliveryMode, fix POP3 set/add confusion that was duplicating messages