[PATCH COMMIT] mail-lib