Code change

MessageComposer update
- NSConstraints
- Few other minor changes