diff --git a/him-app-kmail.png b/hi32-app-kmail.png
similarity index 100%
rename from him-app-kmail.png
rename to hi32-app-kmail.png
diff --git a/hil-app-kmail.png b/hi48-app-kmail.png
similarity index 100%
rename from hil-app-kmail.png
rename to hi48-app-kmail.png
diff --git a/kmfolderdia.cpp b/kmfolderdia.cpp
index 0d04de6ed..ae8e73886 100644
--- a/kmfolderdia.cpp
+++ b/kmfolderdia.cpp
@@ -69,6 +69,15 @@ KMFolderDialog::KMFolderDialog(KMFolder* aFolder, KMFolderDir *aFolderDir,
       fileInFolder->setCurrentItem( i );
     ++i;
   }
+<<<<<<< kmfolderdia.cpp
+
+  setMainWidget( hb );
+  hb->setMinimumSize( hb->sizeHint() );
+
+  //setResizeMode( KDialogBase::ResizeMinimum );
+
+=======
+>>>>>>> 1.20
 }
 
 
diff --git a/los-app-kmail.png b/lo16-app-kmail.png
similarity index 100%
rename from los-app-kmail.png
rename to lo16-app-kmail.png
diff --git a/lom-app-kmail.png b/lo32-app-kmail.png
similarity index 100%
rename from lom-app-kmail.png
rename to lo32-app-kmail.png