Fixes: #2497 merging the sogo plugin