Merge "Delete unused class." into ub-mail-master