Fixes issue 3646, fixes issue 3647 Change-Id: Ib19add4d3d82bc86db9e976a5a50031c2ac58eea Reviewed-on: http://gerrit.dmdirc.com/670 Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com> Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>