[fix] [minor] Email attachments not working.
[fix] [minor] unknown variable issue
[minor] [fix] file manager saving issue with same file name
[minor] [fix] file manager saving issue with same file name
[fix] [minor] merge conflict fixed