Fix #142: keep conversation empty when there is a chat invitation

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>
Merge branch 'master' into smack4