Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html	(revision 3899)
+++ /CKEditor/trunk/CHANGES.html	(revision 3900)
@@ -132,4 +132,7 @@
 		<li><a href="http://dev.fckeditor.net/ticket/3836">#3836</a> : Fixed remove list in enterMode=BR will merge sibling text to one line.</li>
 		<li><a href="http://dev.fckeditor.net/ticket/3949">#3949</a> : Fixed enterKey within pre-formatted text introduce wrong line-break.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/3878">#3878</a> : Whenever possible, 
+			dialogs will not present scrollbars if the content is too big for its standard 
+			size.</li>
 	</ul>
 	<h3>
Index: /CKEditor/trunk/_source/plugins/pastefromword/dialogs/pastefromword.js
===================================================================
--- /CKEditor/trunk/_source/plugins/pastefromword/dialogs/pastefromword.js	(revision 3899)
+++ /CKEditor/trunk/_source/plugins/pastefromword/dialogs/pastefromword.js	(revision 3900)
@@ -237,5 +237,5 @@
 					{
 						type : 'html',
-						style : 'white-space: normal;',
+						style : 'white-space:normal;width:346px;display:block',
 						onShow : function()
 						{
Index: /CKEditor/trunk/_source/skins/kama/skin.js
===================================================================
--- /CKEditor/trunk/_source/skins/kama/skin.js	(revision 3899)
+++ /CKEditor/trunk/_source/skins/kama/skin.js	(revision 3900)
@@ -224,4 +224,5 @@
 				height = data.height,
 				dialog = data.dialog,
+				contents = dialog.parts.contents,
 				standardsMode = !CKEDITOR.env.quirks;
 
@@ -229,9 +230,18 @@
 				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 )
@@ -241,6 +251,5 @@
 			setTimeout( function()
 				{
-					var content = dialog.parts.contents,
-						body = content.getParent(),
+					var body = contents.getParent(),
 						innerDialog = body.getParent();