Merge maildir-sync
move validity checks and source specific stuff to source