Fixed nasty message folder move bug and more :D