removed unnecessary span tags for regular messages