Merge "Fix NPE from null email address" into ub-mail-master