Refactored content disposition strings

* as per Ivo's request, content-disposition strings were
  refactored

Change-Id: I4b603d1e5e0dd239ec3a640f84fff94b09b2c41e