fix issue with empty translation
fix message option