clean junk in contact sync engine
Merge remote-tracking branch 'origin/master'
parse html in conversation, eliminate quoted message
Merge remote-tracking branch 'origin/master'