Index: _source/plugins/pastefromword/dialogs/pastefromword.js =================================================================== --- _source/plugins/pastefromword/dialogs/pastefromword.js (revision 3894) +++ _source/plugins/pastefromword/dialogs/pastefromword.js (working copy) @@ -236,7 +236,7 @@ [ { type : 'html', - style : 'white-space: normal;', + style : 'white-space:normal;width:346px;display:block', onShow : function() { /* Index: _source/skins/kama/skin.js =================================================================== --- _source/skins/kama/skin.js (revision 3894) +++ _source/skins/kama/skin.js (working copy) @@ -223,16 +223,26 @@ width = data.width, height = data.height, dialog = data.dialog, + contents = dialog.parts.contents, standardsMode = !CKEDITOR.env.quirks; if ( data.skin != 'kama' ) return; - dialog.parts.contents.setStyles( - { - width : width + 'px', - height : height + 'px' - }); + contents.setStyles( + CKEDITOR.env.ie ? + { + width : width + 'px', + height : height + 'px' + } + : + { + // To avoid having scrollbars in the dialogs, we're + // (for now) using the "min-xxx" properties, for + // browsers which well support it (#3878). + 'min-width' : width + 'px', + 'min-height' : height + 'px' + }); if ( !CKEDITOR.env.ie ) return; @@ -240,8 +250,7 @@ // Fix the size of the elements which have flexible lengths. setTimeout( function() { - var content = dialog.parts.contents, - body = content.getParent(), + var body = contents.getParent(), innerDialog = body.getParent(); // tc Index: CHANGES.html =================================================================== --- CHANGES.html (revision 3894) +++ CHANGES.html (working copy) @@ -130,6 +130,9 @@