added check if notification exists before constructing it closes #989
increased xmpp timeout and naming tweaks
More robust refresh token handling
More robust refresh token handling