Cleaned up loading and replace order of contact and message detail panes.
Merge branch 'master' into TOOLS-177