diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2me/org/eclipse/swt/internal/Library.java b/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2me/org/eclipse/swt/internal/Library.java
index beff468..9c867a1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2me/org/eclipse/swt/internal/Library.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2me/org/eclipse/swt/internal/Library.java
@@ -22,7 +22,7 @@
 	/**
 	 * SWT Minor version number (must be in the range 0..999)
 	 */
-    static int MINOR_VERSION = 345;
+    static int MINOR_VERSION = 346;
 	
 	/**
 	 * SWT revision number (must be >= 0)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java b/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java
index c3a621f..98410e0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java
@@ -24,7 +24,7 @@
 	/**
 	 * SWT Minor version number (must be in the range 0..999)
 	 */
-    static int MINOR_VERSION = 345;
+    static int MINOR_VERSION = 346;
 	
 	/**
 	 * SWT revision number (must be >= 0)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.c b/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.c
index b3dd819..d72dfed 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.c
@@ -231,9 +231,18 @@
 				code[j++] = k;
 			}
 
-			//PUSH i - 2 bytes
-			code[j++] = 0x6a;
-			code[j++] = i;
+			if (i > 127) {
+				//PUSH i - 5 bytes
+				code[j++] = 0x68;
+				code[j++] = ((i >> 0) & 0xFF);
+				code[j++] = ((i >> 8) & 0xFF);
+				code[j++] = ((i >> 16) & 0xFF);
+				code[j++] = ((i >> 24) & 0xFF);
+			} else {
+				//PUSH i - 2 bytes
+				code[j++] = 0x6a;
+				code[j++] = i;
+			}
 
 			//MOV EAX callback - 1 + sizeof(SWT_PTR) bytes
 			code[j++] = 0xb8;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.h b/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.h
index 42395d4..85bcc4c 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.h
@@ -34,7 +34,11 @@
 #ifdef REDUCED_CALLBACKS
 #define MAX_CALLBACKS 16
 #else
+#if (defined(USE_ASSEMBLER) && (defined(__i386__) || defined(_M_IX86) || defined(_X86_)) && (defined (_WIN32) || defined (_WIN32_WCE)))
+#define MAX_CALLBACKS 256
+#else
 #define MAX_CALLBACKS 128
+#endif
 #endif /* REDUCED_CALLBACKS */
 
 #define MAX_ARGS 12
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak b/bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak
index 7aa1967..5fd131e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak
@@ -10,5 +10,5 @@
 #*******************************************************************************
 
 maj_ver=3
-min_ver=345
-comma_ver=3,3,4,5
+min_ver=346
+comma_ver=3,3,4,6
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/version.txt b/bundles/org.eclipse.swt/Eclipse SWT/common/version.txt
index c5e4016..73e2156 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/version.txt
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/version.txt
@@ -1 +1 @@
-version 3.345
\ No newline at end of file
+version 3.346
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/buildnotes_swt.html b/bundles/org.eclipse.swt/buildnotes_swt.html
index b9ccde1..c268855 100755
--- a/bundles/org.eclipse.swt/buildnotes_swt.html
+++ b/bundles/org.eclipse.swt/buildnotes_swt.html
@@ -11,6 +11,12 @@
 Eclipse Platform Build Notes<br>
 SWT</h1>
 
+<h2> SWT Build 3.3 046 - Thursday June 7, 2007 </h2>
+<h3><a NAME="Problem reports fixed"></a>Problem reports fixed</h3>
+<blockquote>
+191508 - Content assist causes SWTError: No more callbacks
+</blockquote>
+
 <h2> SWT Build 3.3 045g - Friday June 8, 2007 </h2>
 <h3><a NAME="Problem reports fixed"></a>Problem reports fixed</h3>
 <blockquote>