--- a/imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailserversession.cpp	Tue Sep 14 21:55:34 2010 +0300
+++ b/imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailserversession.cpp	Wed Sep 15 12:32:44 2010 +0300
@@ -810,7 +810,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 )
                {
@@ -819,7 +820,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;