diff --git a/uppsrc/ide/Common/ComDlg.cpp b/uppsrc/ide/Common/ComDlg.cpp
index 0239dd84c..4c1b48487 100644
--- a/uppsrc/ide/Common/ComDlg.cpp
+++ b/uppsrc/ide/Common/ComDlg.cpp
@@ -23,7 +23,8 @@ void IdeFileIcon0(bool dir, const String& filename, Image& img)
 		img = IdeCommonImg::Language();
 	if(ext == ".icpp")
 		img = IdeCommonImg::ISource();
-	if(ext == ".c" || ext == ".cpp" || ext == ".cc" || ext == ".cxx")
+	if(ext == ".c" || ext == ".cpp" || ext == ".cc" || ext == ".cxx"
+	               || ext == ".m" || ext == ".mm")  //should later have diff img?
 		img = IdeCommonImg::Source();
 	if(ext == ".sch")
 		img = IdeCommonImg::Sch();
diff --git a/uppsrc/ide/Core/Workspace.cpp b/uppsrc/ide/Core/Workspace.cpp
index ce1893fb7..c0f4e6d1b 100644
--- a/uppsrc/ide/Core/Workspace.cpp
+++ b/uppsrc/ide/Core/Workspace.cpp
@@ -207,7 +207,8 @@ String GetUppDir() {
 bool IsCSourceFile(const char *path)
 {
 	String ext = ToLower(GetFileExt(path));
-	return ext == ".cpp" || ext == ".c" || ext == ".cc" || ext == ".cxx" || ext == ".icpp";
+	return ext == ".cpp" || ext == ".c" || ext == ".cc" || ext == ".cxx"
+	                     || ext == ".m" || ext == ".mm" || ext == ".icpp";
 }
 
 bool IsCHeaderFile(const char *path)
diff --git a/uppsrc/ide/FindInFiles.cpp b/uppsrc/ide/FindInFiles.cpp
index c266a3ec1..c0fbe1aad 100644
--- a/uppsrc/ide/FindInFiles.cpp
+++ b/uppsrc/ide/FindInFiles.cpp
@@ -377,7 +377,7 @@ void Ide::FindFolder()
 
 void Ide::ConstructFindInFiles() {
 	ff.find.AddButton().SetMonoImage(CtrlImg::smallright()).Tip("Wildcard") <<= THISBACK(FindWildcard);
-	static const char *defs = "*.cpp *.h *.hpp *.c *.C *.cxx *.cc *.icpp *.sch *.lay *.rc";
+	static const char *defs = "*.cpp *.h *.hpp *.c *.m *.C *.M *.cxx *.cc *.mm *.MM *.icpp *.sch *.lay *.rc";
 	ff.files <<= String(defs);
 	ff.files.AddList((String)defs);
 	ff.files.AddList((String)"*.txt");
diff --git a/uppsrc/ide/idefile.cpp b/uppsrc/ide/idefile.cpp
index 98e16ae01..09bbfee40 100644
--- a/uppsrc/ide/idefile.cpp
+++ b/uppsrc/ide/idefile.cpp
@@ -12,7 +12,8 @@ void Ide::SetupEditor(int f, String hl, String fn)
 	}
 	if(IsNull(hl)) {
 		if(ext == ".c" || ext == ".cpp" || ext == ".cc" || ext == ".cxx" ||
-		   ext == ".h" || ext == ".hpp" || ext == ".hh" || ext == ".hxx" || ext == ".icpp")
+		   ext == ".h" || ext == ".hpp" || ext == ".hh" || ext == ".hxx" ||
+		   ext == ".m"                  || ext == ".mm" || ext == ".icpp")
 			editor.Highlight(CodeEditor::HIGHLIGHT_CPP);
 		else
 		if(ext == ".usc")