Milestone 6

merge in messages ie fix