--- a/imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailserversession.cpp	Mon Aug 23 13:32:17 2010 +0300
+++ b/imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailserversession.cpp	Fri Sep 03 10:29:37 2010 +0300
@@ -852,7 +852,8 @@
         
         TSize bitmapSize = bitmap->SizeInPixels();
         
-        for ( TInt i( 0 ); i < count; i++ )
+        // scale small thumbs first, because fullscreen encoding takes longer
+        for ( TInt i( count-1 ); i >= 0; i-- )
             {           
             if( bitmapSize.iWidth < bitmapSize.iHeight )
                {
@@ -861,7 +862,8 @@
                if ( size == EFullScreenThumbnailSize ||
                     size == EVideoFullScreenThumbnailSize ||
                     size == EAudioFullScreenThumbnailSize ||
-                    size == EImageFullScreenThumbnailSize )
+                    size == EImageFullScreenThumbnailSize ||
+                    size == EContactFullScreenThumbnailSize )
                    {
                    TInt height = (*missingSizes)[i].iSize.iHeight;
                    (*missingSizes)[i].iSize.iHeight = (*missingSizes)[i].iSize.iWidth;