Merge "Update Spam Warning View." into ub-mail-master