(#2844) - Encode attachment names