Removed unnecessary rewrapping of messages