diff --git a/Geo/Cell.cpp b/Geo/Cell.cpp
index fd9b3e894e5dff8f083276a4f7fc69f609ee3aae..95a4d6ec665820298a08b220bf460998eddd3c53 100644
--- a/Geo/Cell.cpp
+++ b/Geo/Cell.cpp
@@ -3,7 +3,7 @@
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
-// Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
+// Contributed by Matti Pellikka <matti.pellikka@gmail.com>.
 
 #include "Cell.h"
 #include "MTriangle.h"
diff --git a/Geo/Cell.h b/Geo/Cell.h
index f2a66c7829d8e9c8868ddfae0d563b881ef05df5..9eb3daf1d1ca411908a35461c48d3b38d953dce6 100644
--- a/Geo/Cell.h
+++ b/Geo/Cell.h
@@ -3,7 +3,7 @@
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
-// Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
+// Contributed by Matti Pellikka <matti.pellikka@gmail.com>.
 
 #ifndef _CELL_H_
 #define _CELL_H_
diff --git a/Geo/CellComplex.cpp b/Geo/CellComplex.cpp
index 95001200b9e0dc51fef3681b9488c7ae9b069dd6..da694bdf0b5227712ee055206f13ecbd22fe1697 100644
--- a/Geo/CellComplex.cpp
+++ b/Geo/CellComplex.cpp
@@ -3,7 +3,7 @@
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
-// Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
+// Contributed by Matti Pellikka <matti.pellikka@gmail.com>.
 
 #include "CellComplex.h"
 #include "MElement.h"
diff --git a/Geo/CellComplex.h b/Geo/CellComplex.h
index 76bedfa5eaec41995b1b156a78498d4de06cbee5..a3ec6da0d85b6cd586d19b45805df12ad4ef46b2 100644
--- a/Geo/CellComplex.h
+++ b/Geo/CellComplex.h
@@ -3,7 +3,7 @@
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
-// Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
+// Contributed by Matti Pellikka <matti.pellikka@gmail.com>.
 
 #ifndef _CELLCOMPLEX_H_
 #define _CELLCOMPLEX_H_
diff --git a/Geo/Chain.cpp b/Geo/Chain.cpp
index 5892c6942e9e6c9adceac5c1063401df0223d836..fcfb0fddb3691eafe5f7d42c71f6bf942945452b 100644
--- a/Geo/Chain.cpp
+++ b/Geo/Chain.cpp
@@ -3,7 +3,7 @@
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
-// Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
+// Contributed by Matti Pellikka <matti.pellikka@gmail.com>.
 
 #include "Chain.h"
 #include "MLine.h"
diff --git a/Geo/Chain.h b/Geo/Chain.h
index 06df3709ddb3e3f5b15b1c442ec822342cda291e..c56c1c63c78ba329b2793c0389b7e079cbc8b927 100644
--- a/Geo/Chain.h
+++ b/Geo/Chain.h
@@ -3,7 +3,7 @@
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
-// Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
+// Contributed by Matti Pellikka <matti.pellikka@gmail.com>.
 
 #ifndef _CHAIN_H_
 #define _CHAIN_H_
diff --git a/Geo/ChainComplex.cpp b/Geo/ChainComplex.cpp
index 91e2e6264c64c47e2515b27145e1ad12d0f85edc..2a9cec295117bff00400c2e6b8e9effc68443914 100644
--- a/Geo/ChainComplex.cpp
+++ b/Geo/ChainComplex.cpp
@@ -3,7 +3,7 @@
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
-// Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
+// Contributed by Matti Pellikka <matti.pellikka@gmail.com>.
 
 #include "GmshConfig.h"
 #if defined(HAVE_KBIPACK)
diff --git a/Geo/ChainComplex.h b/Geo/ChainComplex.h
index 38b301bc0051bd0d9530ad30e61e47ee5a9f5d6b..3b27296b1aa2cba3c5d8def12bd67f8057c496d9 100644
--- a/Geo/ChainComplex.h
+++ b/Geo/ChainComplex.h
@@ -3,7 +3,7 @@
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
-// Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
+// Contributed by Matti Pellikka <matti.pellikka@gmail.com>.
 
 #ifndef _CHAINCOMPLEX_H_
 #define _CHAINCOMPLEX_H_
diff --git a/Geo/Homology.cpp b/Geo/Homology.cpp
index 50500eb93c80969ba66dcc0babf27a52ee1796f7..18f845af54ca3c0d995df64049a3c29b05d39773 100644
--- a/Geo/Homology.cpp
+++ b/Geo/Homology.cpp
@@ -3,7 +3,7 @@
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
-// Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
+// Contributed by Matti Pellikka <matti.pellikka@gmail.com>.
 
 #include "Homology.h"
 
diff --git a/Geo/Homology.h b/Geo/Homology.h
index 5649927a1c66d0272b483bf52ed738b6114eaa45..d6e5c066bcc804a8c97677c2f82d37c34bf054df 100644
--- a/Geo/Homology.h
+++ b/Geo/Homology.h
@@ -3,7 +3,7 @@
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
-// Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
+// Contributed by Matti Pellikka <matti.pellikka@gmail.com>.
 
 #ifndef _HOMOLOGY_H_
 #define _HOMOLOGY_H_