diff --git a/jquery.jeditable.js b/jquery.jeditable.js
index eb8a911..76d2cf3 100644
--- a/jquery.jeditable.js
+++ b/jquery.jeditable.js
@@ -104,7 +104,7 @@
         settings.autowidth  = 'auto' == settings.width;
         settings.autoheight = 'auto' == settings.height;
         
-        return this.each(function() {
+        var ret = this.each(function() {
                         
             /* Save this to self because this changes when scope changes. */
             var self = this;  
@@ -171,7 +171,9 @@
                 }
                                 
                 self.editing    = true;
-                self.revert     = $(self).html();
+                /* Show encoded html */
+                //self.revert     = $(self).html();
+                self.revert = $(self).text();
                 $(self).html('');
 
                 /* Create the form object. */
@@ -323,7 +325,9 @@
                               submitdata[settings.id] = self.id;
                               /* Add extra data to be POST:ed. */
                               if ($.isFunction(settings.submitdata)) {
-                                  $.extend(submitdata, settings.submitdata.apply(self, [self.revert, settings]));
+                                  /* Sending input value */
+                                  /* $.extend(submitdata, settings.submitdata.apply(self, [self.revert, settings])); */
+                                  $.extend(submitdata, settings.submitdata.apply(self, [input.val(), settings]));
                               } else {
                                   $.extend(submitdata, settings.submitdata);
                               }
@@ -344,7 +348,9 @@
                                   url     : settings.target,
                                   success : function(result, status) {
                                       if (ajaxoptions.dataType == 'html') {
-                                        $(self).html(result);
+                                        /* Do html encode */
+                                        // $(self).html(result);
+                                        $(self).text(result);
                                       }
                                       self.editing = false;
                                       callback.apply(self, [result, settings]);
@@ -377,8 +383,10 @@
                 /* Prevent calling reset twice when blurring. */
                 if (this.editing) {
                     /* Before reset hook, if it returns false abort reseting. */
-                    if (false !== onreset.apply(form, [settings, self])) { 
-                        $(self).html(self.revert);
+                    if (false !== onreset.apply(form, [settings, self])) {
+                        /* Show encoded html */
+                        //$(self).html(self.revert);
+                        $(self).text(self.revert);
                         self.editing   = false;
                         if (!$.trim($(self).html())) {
                             $(self).html(settings.placeholder);
@@ -392,6 +400,7 @@
             };            
         });
 
+      return ret;
     };