Merge "Fix possible null subject case on s3" into jb-ub-mail