diff --git a/modules/react-native-status/android/build.gradle b/modules/react-native-status/android/build.gradle
index 200f0a199b..2f631b74cf 100644
--- a/modules/react-native-status/android/build.gradle
+++ b/modules/react-native-status/android/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     implementation 'com.github.ericwlange:AndroidJSCore:3.0.1'
     implementation 'status-im:function:0.0.1'
 
-    String statusGoVersion = 'develop-g737a964a'
+    String statusGoVersion = 'develop-ga339d7ed'
     final String statusGoGroup = 'status-im', statusGoName = 'status-go'
 
     // Check if the local status-go jar exists, and compile against that if it does
diff --git a/modules/react-native-status/ios/RCTStatus/pom.xml b/modules/react-native-status/ios/RCTStatus/pom.xml
index 7ff45def8c..30b4e3d11f 100644
--- a/modules/react-native-status/ios/RCTStatus/pom.xml
+++ b/modules/react-native-status/ios/RCTStatus/pom.xml
@@ -25,7 +25,7 @@
                         <artifactItem>
                             <groupId>status-im</groupId>
                             <artifactId>status-go-ios-simulator</artifactId>
-                            <version>develop-g737a964a</version>
+                            <version>develop-ga339d7ed</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
                             <outputDirectory>./</outputDirectory>
diff --git a/scripts/update-status-go.sh b/scripts/update-status-go.sh
index 345d3133a7..dd6f058ef7 100755
--- a/scripts/update-status-go.sh
+++ b/scripts/update-status-go.sh
@@ -27,5 +27,5 @@ fi
 
 STATUSGO_VERSION=$1
 
-sedi "s/\(<version>\).*\(<\/version>\)/\1$STATUSGO_VERSION\2/" modules/react-native-status/ios/RCTStatus/pom.xml
+sedi "s/\([[:blank:]]\{28,\}<version>\).*\(<\/version>\)/\1$STATUSGO_VERSION\2/" modules/react-native-status/ios/RCTStatus/pom.xml
 sedi "s/\(statusGoVersion = '\).*\('\)/\1$STATUSGO_VERSION\2/" modules/react-native-status/android/build.gradle
diff --git a/src/status_im/constants.cljs b/src/status_im/constants.cljs
index e445218932..34366daab6 100644
--- a/src/status_im/constants.cljs
+++ b/src/status_im/constants.cljs
@@ -103,11 +103,7 @@
              "mailserver-f" {:id      "mailserver-f" ;mail-03.gc-us-central1-a.eth.beta
                              :name    "Status mailserver F"
                              :password inbox-password
-                             :address "enode://531e252ec966b7e83f5538c19bf1cde7381cc7949026a6e499b6e998e695751aadf26d4c98d5a4eabfb7cefd31c3c88d600a775f14ed5781520a88ecd25da3c6@35.225.227.79:30504"}
-             "mailserver-g" {:id      "mailserver-g" ;mail-03.eth.beta
-                             :name    "Status mailserver G"
-                             :password inbox-password
-                             :address "enode://505935d249a6ff85698dde5566d041d53ffcfea5a55d740ef224524d69b7a53058b99a5276ac913d797e0640e644d0f0f0a1a30f8f162d2d7f2abb3064c869b2@185.156.42.129:30504"}}
+                             :address "enode://531e252ec966b7e83f5538c19bf1cde7381cc7949026a6e499b6e998e695751aadf26d4c98d5a4eabfb7cefd31c3c88d600a775f14ed5781520a88ecd25da3c6@35.225.227.79:30504"}}
    :mainnet {"mailserver-a" {:id      "mailserver-a" ;mail-01.do-ams3.eth.beta
                              :name    "Status mailserver A"
                              :password inbox-password
@@ -131,11 +127,7 @@
              "mailserver-f" {:id      "mailserver-f" ;mail-03.gc-us-central1-a.eth.beta
                              :name    "Status mailserver F"
                              :password inbox-password
-                             :address "enode://531e252ec966b7e83f5538c19bf1cde7381cc7949026a6e499b6e998e695751aadf26d4c98d5a4eabfb7cefd31c3c88d600a775f14ed5781520a88ecd25da3c6@35.225.227.79:30504"}
-             "mailserver-g" {:id      "mailserver-g" ;mail-03.eth.beta
-                             :name    "Status mailserver G"
-                             :password inbox-password
-                             :address "enode://505935d249a6ff85698dde5566d041d53ffcfea5a55d740ef224524d69b7a53058b99a5276ac913d797e0640e644d0f0f0a1a30f8f162d2d7f2abb3064c869b2@185.156.42.129:30504"}}
+                             :address "enode://531e252ec966b7e83f5538c19bf1cde7381cc7949026a6e499b6e998e695751aadf26d4c98d5a4eabfb7cefd31c3c88d600a775f14ed5781520a88ecd25da3c6@35.225.227.79:30504"}}
    :rinkeby {"mailserver-a" {:id     "mailserver-a"
                              :name   "Status mailserver A"
                              :password inbox-password