Code review comment for lp://staging/~daniel-watkins-credativ/poweremail/dw-fix-v6

A bit unfortunate you merged your other branches into this one as well (as it provides a more cluttered overview of changes this branch does), but I was able to merge succesfully with bzr and the conflicts found were minor (whitespaces etc).