diff --git a/retroshare-gui/src/changelog.txt b/retroshare-gui/src/changelog.txt
index 9ca2be8f3..8081af33b 100644
--- a/retroshare-gui/src/changelog.txt
+++ b/retroshare-gui/src/changelog.txt
@@ -1,7 +1,17 @@
 
 Changes for v0.4.x
 
-*
+
+* Bugfixes in CreateForumMsg 
+* Added auto update feature to the trust matrix
+* Implemented a big trust table where people can see who trusts who, and who is trusted by who.
+* Added Configurations to new file transfer.
+* Enabled config in p3file-startup.cc
+* Enabled resumeTransfers
+* Added new RsFileConfigItem to serialiser.
+* Extended ftFiMonitor to use Configuration.
+* Bug fix to add/remove Shared Dirs.
+* Increased Channel/forum periods to 3/12 months.
 * Create channels directory correctly.
 * Added File Transfers to Config List.
 * Connected statusChange() monitor callback.
diff --git a/retroshare-gui/src/gui/SearchDialog.cpp b/retroshare-gui/src/gui/SearchDialog.cpp
index 87964411d..91de3d973 100644
--- a/retroshare-gui/src/gui/SearchDialog.cpp
+++ b/retroshare-gui/src/gui/SearchDialog.cpp
@@ -169,7 +169,7 @@ void SearchDialog::initialiseFileTypeMappings()
 	SearchDialog::FileTypeExtensionMap->insert(FILETYPE_IDX_AUDIO, 
 		"aac aif iff m3u mid midi mp3 mpa ogg ra ram wav wma");
 	SearchDialog::FileTypeExtensionMap->insert(FILETYPE_IDX_VIDEO, 
-		"3gp asf asx avi mov mp4 mpeg mpg qt rm swf vob wmv");
+		"3gp asf asx avi mov mp4 mkv flv mpeg mpg qt rm swf vob wmv");
 	SearchDialog::FileTypeExtensionMap->insert(FILETYPE_IDX_PICTURE, 
 		"3dm 3dmf ai bmp drw dxf eps gif ico indd jpe jpeg jpg mng pcx pcc pct pgm "
 		"pix png psd psp qxd qxprgb sgi svg tga tif tiff xbm xcf");
diff --git a/retroshare-gui/src/rsiface/RemoteDirModel.cpp b/retroshare-gui/src/rsiface/RemoteDirModel.cpp
index 6e1050dd8..df57ff311 100644
--- a/retroshare-gui/src/rsiface/RemoteDirModel.cpp
+++ b/retroshare-gui/src/rsiface/RemoteDirModel.cpp
@@ -256,7 +256,9 @@ RemoteDirModel::RemoteDirModel(bool mode, QObject *parent)
 			QIcon icon(":/images/FileTypePicture.png");
 		    return icon;
 		}
-		else if (ext == "avi" || ext == "mpg" || ext == "mpeg" || ext == "wmv")
+		else if (ext == "avi" || ext == "mpg" || ext == "mpeg" || ext == "wmv"
+			|| ext == "mkv" || ext == "mp4" || ext == "flv" || ext == "mov"
+			|| ext == "vob" || ext == "qt" || ext == "rm" || ext == "3gp")
 		{
 			//setIcon(0, QIcon(":/images/videofile.png"));
 			QIcon icon(":/images/FileTypeVideo.png");