Merge maildir-sync
Merge branch 'upd' into running_upd
move validity checks and source specific stuff to source