Email to File now works
+ comments
+ import fixes