Use the right DeviceId
Merge branch 'master' of https://github.com/inverse-inc/sogo