diff --git a/mozilla/configure b/mozilla/configure
index 6317053be30..68e8f298dd1 100755
--- a/mozilla/configure
+++ b/mozilla/configure
@@ -4182,7 +4182,7 @@ EOF
 	   AR='$(CXX) -ar'
 	   AR_FLAGS='-o $@'
        CFLAGS="$CFLAGS -woff 3262"
-       CXXFLAGS="$CXXFLAGS -woff 3262 -LANG:exceptions=OFF"
+       CXXFLAGS="$CXXFLAGS -woff 3262"
        if test -n "$USE_N32"; then
 	   CFLAGS="$CFLAGS -n32"
 	   CXXFLAGS="$CXXFLAGS -n32"
diff --git a/mozilla/configure.in b/mozilla/configure.in
index 02f6295593e..6c8023e2a04 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -638,7 +638,7 @@ case "$target" in
 	   AR='$(CXX) -ar'
 	   AR_FLAGS='-o $@'
        CFLAGS="$CFLAGS -woff 3262"
-       CXXFLAGS="$CXXFLAGS -woff 3262 -LANG:exceptions=OFF"
+       CXXFLAGS="$CXXFLAGS -woff 3262"
        if test -n "$USE_N32"; then
 	   CFLAGS="$CFLAGS -n32"
 	   CXXFLAGS="$CXXFLAGS -n32"
diff --git a/mozilla/mailnews/compose/src/nsMsgSend.cpp b/mozilla/mailnews/compose/src/nsMsgSend.cpp
index d92d4048617..17ff62a9a5d 100644
--- a/mozilla/mailnews/compose/src/nsMsgSend.cpp
+++ b/mozilla/mailnews/compose/src/nsMsgSend.cpp
@@ -1044,6 +1044,10 @@ nsMsgComposeAndSend::GatherMimeAttachments()
 		status = DeliverMessage();
 		shouldDeleteDeliveryState = PR_FALSE;
 	}
+	goto FAIL;
+
+FAILMEM:
+	status = NS_ERROR_OUT_OF_MEMORY;
 
 FAIL:
 	if (toppart)
@@ -1070,9 +1074,6 @@ FAIL:
 
 	return status;
 
-FAILMEM:
-	status = NS_ERROR_OUT_OF_MEMORY;
-	goto FAIL;
 }
 
 PRInt32