Index: /FCKeditor/trunk/editor/fckdialog.html
===================================================================
--- /FCKeditor/trunk/editor/fckdialog.html	(revision 954)
+++ /FCKeditor/trunk/editor/fckdialog.html	(revision 955)
@@ -89,5 +89,5 @@
 
 		var iFrameHeight ;
-		if ( document.all || window.dialogArguments.Editor.FCKBrowserInfo.IsSafari )
+		if ( document.all )
 			iFrameHeight = oInnerDoc.body.offsetHeight ;
 		else
@@ -105,4 +105,16 @@
 				window.resizeBy( 0, iDiff ) ;
 		}
+	}
+}
+
+// Kludge for #1308 : Safari seems to have a bug with the time when RefreshSize() is executed - it thinks frmMain's innerHeight 
+// is 0 if we query the value too soon after the page is loaded in some circumstances.
+if ( window.dialogArguments.Editor.FCKBrowser.IsSafari )
+{
+	window.OriginalRefreshSize = RefreshSize ;
+
+	RefreshSize = function()
+	{
+		window.setTimeout( window.OriginalRefreshSize, 1 );
 	}
 }