Desktop messenger page again
Merging issue-41 into develop and resolved conflicts