Change message number to UID
Fixes and Improvements