Feature/3846 wrong message on mobile