Make FileBodyPart fileName, contentId and transferEncoding Expressions, close #1299
Minor clean up