changed cp to mv. Added email category option

merged former dev branch into torrent branch...
Auto merge not possible.