fixed plaintext content setter, added more constants
mergeconflict