diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index f3651a2ce47969c77ad1164ee719e1a113924d27..f885ceb5f0d7d9d7f3d3a5ddca6b6d3bb221d15d 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,7 +6,8 @@ Wysiwyg x.x-x.x, xxxx-xx-xx
 
 Wysiwyg 6.x-x.x, xxxx-xx-xx
 ---------------------------
-#348317 by sun: Fixed TinyMCE's extended_valid_elements for advlink plugin.
+#348317 by sun: Fixed TinyMCE's extended_valid_elements for advlink/advimage
+  plugin.
 #348986 by sun: Added CSS class for toggle link container.
 #342864 by davexoxide, sun: Added YUI editor support.
 #343217 by sun: Fixed improperly capitalized library script name for nicEdit.
diff --git a/editors/tinymce.inc b/editors/tinymce.inc
index 98eb08576007ff18bdb6e9d51f84dbe1f634b072..73214047957a58f2e829fa93738477606b3fec85 100644
--- a/editors/tinymce.inc
+++ b/editors/tinymce.inc
@@ -379,7 +379,7 @@ function wysiwyg_tinymce_plugins($editor) {
     'advimage' => array(
       'path' => $editor['library path'] .'/plugins/advimage',
       'extensions' => array('advimage' => t('Advanced image')),
-      'extended_valid_elements' => array('img[class|src|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name]'),
+      'extended_valid_elements' => array('img[src|alt|title|align|width|height|hspace|vspace|border|style|class|onmouseover|onmouseout|id|name]'),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advimage',
       'internal' => TRUE,
       'load' => TRUE,