Mail module: fixing feedback messages