diff --git a/mozilla/db/mork/src/morkBuilder.cpp b/mozilla/db/mork/src/morkBuilder.cpp
index 0d4bd9bf03a..93f59f22a78 100644
--- a/mozilla/db/mork/src/morkBuilder.cpp
+++ b/mozilla/db/mork/src/morkBuilder.cpp
@@ -779,7 +779,8 @@ morkBuilder::OnValueMid(morkEnv* ev, const morkSpan& inSpan,
     mork_token* metaSlot = mBuilder_MetaTokenSlot;
     if ( metaSlot )
     {
-      if ( valOid->mOid_Scope == morkStore_kColumnSpaceScope )
+    	mork_scope valScope = valOid->mOid_Scope;
+      if ( !valScope || valScope == morkStore_kColumnSpaceScope )
       {
         if ( ev->Good() && valMid.HasSomeId() )
         {
diff --git a/mozilla/mailnews/db/mork/src/morkBuilder.cpp b/mozilla/mailnews/db/mork/src/morkBuilder.cpp
index 0d4bd9bf03a..93f59f22a78 100644
--- a/mozilla/mailnews/db/mork/src/morkBuilder.cpp
+++ b/mozilla/mailnews/db/mork/src/morkBuilder.cpp
@@ -779,7 +779,8 @@ morkBuilder::OnValueMid(morkEnv* ev, const morkSpan& inSpan,
     mork_token* metaSlot = mBuilder_MetaTokenSlot;
     if ( metaSlot )
     {
-      if ( valOid->mOid_Scope == morkStore_kColumnSpaceScope )
+    	mork_scope valScope = valOid->mOid_Scope;
+      if ( !valScope || valScope == morkStore_kColumnSpaceScope )
       {
         if ( ev->Good() && valMid.HasSomeId() )
         {