Attached is a patch that should fix this issue.  I have some other 
`whitespace-mode' fixes in progress; I'll open new issues (or reply to 
existing issues) for those.