parsing file name into vars
leave the plus sign in sender if existed
Merge pull request #253 from Mancy/master

shorten lines
Merge remote-tracking branch 'upstream/master'