[#85] shortened flash messages code