Merge "handle empty snippets" into jb-ub-mail