Merge the bugs fixed about the Chinese display issue and attachment name