diff --git a/mozilla/view/src/nsView.cpp b/mozilla/view/src/nsView.cpp
index 22c4e75f68d..973f14d42e0 100644
--- a/mozilla/view/src/nsView.cpp
+++ b/mozilla/view/src/nsView.cpp
@@ -396,6 +396,8 @@ NS_IMETHODIMP nsView :: Paint(nsIRenderingContext& rc, const nsRect& rect,
           nscoord     posx, posy;
           nsRect      damRect = rect;
 
+          rc.PushState();
+
           GetPosition(&posx, &posy);
 
           //we need to go back to the coordinate system that was there
@@ -512,8 +514,7 @@ NS_IMETHODIMP nsView :: Paint(nsIRenderingContext& rc, const nsRect& rect,
             delete views;
           }
 
-          //now go forward again... XXX xform not accounted for. MMP
-          rc.Translate(posx, posy);
+          rc.PopState();
         }
 
         //now draw ourself...
diff --git a/mozilla/view/src/nsViewManager.cpp b/mozilla/view/src/nsViewManager.cpp
index 7c1bae9bfff..453eaa26615 100644
--- a/mozilla/view/src/nsViewManager.cpp
+++ b/mozilla/view/src/nsViewManager.cpp
@@ -262,9 +262,9 @@ NS_IMETHODIMP nsViewManager :: SetWindowOffsets(nscoord xoffset, nscoord yoffset
     nsresult           retval;
 
     retval = mRootView->QueryInterface(kIScrollableViewIID, (void **)&scroller);
-    if (NS_SUCCEEDED(retval)) {
+
+    if (NS_SUCCEEDED(retval))
       scroller->SetVisibleOffset(xoffset, yoffset);
-    }
 
     return retval;
   }