Fixes issue 1109 Fixes issue 1108 git-svn-id: http://svn.dmdirc.com/trunk@3958 00569f92-eb28-0410-84fd-f71c24880f