Index: wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.dev.js
===================================================================
--- wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.dev.js	(revision 11805)
+++ wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.dev.js	(working copy)
@@ -97,14 +97,39 @@
 
 			ed.onBeforeSetContent.add(function(ed, o) {
 				o.content = t._do_shcode(o.content);
+				o.content = t._fix_stupid_wp_bug(o.content);
 			});
 
 			ed.onPostProcess.add(function(ed, o) {
-				if (o.get)
+				if (o.get) {
 					o.content = t._get_shcode(o.content);
+					o.content = t._unfix_stupid_wp_bug(o.content);
+				}
 			});
 		},
 
+		_fix_stupid_wp_bug : function(co) {
+			return co.replace(/<img (?:.+?)aligncenter(?:.+?)>/g, function(a){
+				var id, cls, w, cap, div_cls;
+
+				a = a.replace(/\\&#39;|\\&#039;/g, '&#39;').replace(/\\&quot;/g, '&quot;');
+				div_cls = 'mceIEcenter';
+
+				return '<div class="'+div_cls+'">'+a+'</div>';
+			});
+		},
+
+		_unfix_stupid_wp_bug : function(co) {
+			return co.replace(/<div class="mceIEcenter">(<img (?:.+?)aligncenter(?:.+?)>)<\/div>/g, function(a,b){
+				var id, cls, w, cap, div_cls;
+
+				b = b.replace(/\\&#39;|\\&#039;/g, '&#39;').replace(/\\&quot;/g, '&quot;');
+				div_cls = 'mceTemp mceIEcenter';
+
+				return b;
+			});
+		},
+
 		_do_shcode : function(co) {
 			return co.replace(/\[(?:wp_)?caption([^\]]+)\]([\s\S]+?)\[\/(?:wp_)?caption\][\s\u00a0]*/g, function(a,b,c){
 				var id, cls, w, cap, div_cls;