diff --git sc/inc/address.hxx sc/inc/address.hxx
index 76f0d42..af36690 100644
--- sc/inc/address.hxx
+++ sc/inc/address.hxx
@@ -86,7 +86,7 @@ const SCSIZE   SCSIZE_MAX   = ::std::numeric_limits<SCSIZE>::max();
 
 // The maximum values. Defines are needed for preprocessor checks in
 // bcaslot.cxx, otherwise type safe constants are preferred.
-#define MAXROWCOUNT_DEFINE 65536
+#define MAXROWCOUNT_DEFINE 1048576
 #define MAXCOLCOUNT_DEFINE 1024
 
 // Count values
diff --git sc/source/ui/view/hdrcont.cxx sc/source/ui/view/hdrcont.cxx
index 3160bee..be36c2b 100644
--- sc/source/ui/view/hdrcont.cxx
+++ sc/source/ui/view/hdrcont.cxx
@@ -104,7 +104,7 @@ ScHeaderControl::ScHeaderControl( Window* pParent, SelectionEngine* pSelectionEn
 
 	nWidth = nSmallWidth = aSize.Width();
 	nBigWidth = LogicToPixel( Size( GetTextWidth(
-		String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("88888")) ), 0 ) ).Width() + 4;
+		String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("8888888")) ), 0 ) ).Width() + 5;
 
 	SetBackground();	// sonst Probleme auf OS/2 !?!?!
 }