Don't hardcode mailbox delimiter!

fix #518
Don't forget to give the URL...

fix #520
Merge branch 'master' into d3js