Fix punc marks and wrong/empty html tag
Merge branch 'thunderbird-sandstone'