Merge "Skip content values lacking mimetype" into ub-mail-master