     else
       @descriptionInput = new KDCustomHTMLView
         cssClass : 'hidden'
-        partial : oembed?.description or ''
+        partial : @originalDescription
 
     @editIndicator = new KDCustomHTMLView
       tagName : 'div'
       cssClass : 'edit-indicator discussion-edit-indicator'
       pistachio : 'edited'
       tooltip :
-        title: "Original Content was: <p>#{oembed?.original_description or oembed?.description or ''}</p>"
+        title: "Original Content was: <p>#{oembed?.original_description or @original_description}</p>"
     @editIndicator.hide()
 
   getValue:->
     if @options.hasConfig
-      @descriptionInput.getValue()
+      Encoder.XSSEncode @descriptionInput.getValue()
     else
-      @descriptionInput.getPartial()
+      Encoder.XSSEncode @descriptionInput.getPartial()
 
   getOriginalValue:-> @originalDescription
 


    @hide()  unless oembed?.description?.trim()

    @originalDescription = oembed?.description

    if options.hasConfig is yes
      @setClass 'has-config'

        type         : 'textarea'
        cssClass     : 'description_input hidden'
        name         : 'description_input'
        defaultValue : @originalDescription
        autogrow     : yes
        blur         : =>
          @descriptionInput.hide()
