Updated with issues fixed msg view