diff -up thunderbird-3.0/mozilla/modules/libpr0n/build/nsImageModule.cpp.setjmp thunderbird-3.0/mozilla/modules/libpr0n/build/nsImageModule.cpp
--- thunderbird-3.0/mozilla/modules/libpr0n/build/nsImageModule.cpp.setjmp	2009-07-31 13:22:44.000000000 +0200
+++ thunderbird-3.0/mozilla/modules/libpr0n/build/nsImageModule.cpp	2009-07-31 13:34:42.000000000 +0200
@@ -59,6 +59,16 @@
 #include "imgRequestProxy.h"
 #include "imgTools.h"
 
+#ifdef IMG_BUILD_ENCODER_png
+// png
+#include "nsPNGEncoder.h"
+#endif
+#ifdef IMG_BUILD_ENCODER_jpeg
+// jpeg
+#include "nsJPEGEncoder.h"
+#endif
+
+
 #ifdef IMG_BUILD_DECODER_gif
 // gif
 #include "nsGIFDecoder2.h"
@@ -85,17 +95,6 @@
 #include "nsXBMDecoder.h"
 #endif
 
-
-#ifdef IMG_BUILD_ENCODER_png
-// png
-#include "nsPNGEncoder.h"
-#endif
-#ifdef IMG_BUILD_ENCODER_jpeg
-// jpeg
-#include "nsJPEGEncoder.h"
-#endif
-
-
 // objects that just require generic constructors
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(imgContainer)