importing messaging-2008 branch to trunk [continued]