Merge pull request #213 from jugglerchris/master

Fix a crash with prompt strings containing '%'.
Change current_maildir() to return a CMaildir.