diff --git a/ChangeLog b/ChangeLog
index 30a5c953f..44a93f604 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2008-06-09	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
+	* src/gui/main_window.cpp:
+	also show *.xiz files in preset-browser
+
+	* src/gui/file_browser.cpp:
+	classify .xml-files always as presets and do not examine them more
+	detailed - also improves LMMS-startup-times
+
 	* Makefile.am:
 	added a few files to LMMS-headers
 
diff --git a/src/gui/file_browser.cpp b/src/gui/file_browser.cpp
index fb7982f45..12c03afdc 100644
--- a/src/gui/file_browser.cpp
+++ b/src/gui/file_browser.cpp
@@ -223,13 +223,12 @@ void listView::activateListItem( QTreeWidgetItem * _item, int _column )
 #ifdef LMMS_DEBUG
 		assert( it != NULL );
 #endif
-		instrument * afp = it->loadInstrument(
+		instrument * inst = it->loadInstrument(
 				engine::sampleExtensions()[f->extension()] );
-		if( afp != NULL )
+		if( inst != NULL )
 		{
-			afp->setParameter( "samplefile", f->fullName() );
+			inst->setParameter( "samplefile", f->fullName() );
 		}
-		//it->toggledInstrumentTrackButton( TRUE );
 		engine::getMixer()->unlock();
 	}
 	else if( f->type() == fileItem::PresetFile )
@@ -826,20 +825,20 @@ void fileItem::determineFileType( void )
 	}
 	else if( ext == "xml" )
 	{
-		multimediaProject::ProjectTypes t =
+/*		multimediaProject::ProjectTypes t =
 				multimediaProject::typeOfFile( fullName() );
 		if( t == multimediaProject::SongProject )
 		{
 			m_type = ProjectFile;
 		}
 		else if( t == multimediaProject::InstrumentTrackSettings )
-		{
+		{*/
 			m_type = PresetFile;
-		}
+/*		}
 		else
 		{
 			m_type = UnknownFile;
-		}
+		}*/
 	}
 	else if( ext == "csf" )
 	{