diff --git a/yowsup/env/env_android.py b/yowsup/env/env_android.py
index 3a3dce78b..18a0aa806 100644
--- a/yowsup/env/env_android.py
+++ b/yowsup/env/env_android.py
@@ -17,10 +17,10 @@ class AndroidYowsupEnv(YowsupEnv):
         "YHNtYoIvt5R3X6YZylbPftF/8ayWTALBgcqhkjOOAQDBQADLwAwLAIUAKYCp0d6z4QQdyN74JDfQ2WCyi8CFDUM4CaNB+ceVXd" \
         "KtOrNTQcc0e+t"
 
-    _MD5_CLASSES = "/QhoCBMppKpKQumhTC8kcQ=="
+    _MD5_CLASSES = "V1ksV54b7/LZMiv+BQkmwQ=="
     _KEY = "eQV5aq/Cg63Gsq1sshN9T3gh+UUp0wIw0xgHYT1bnCjEqOJQKCRrWxdAe2yvsDeCJL+Y4G3PRD2HUF7oUgiGo8vGlNJOaux26k+A2F3hj8A="
 
-    _VERSION = "2.19.244"
+    _VERSION = "2.21.2"
     _OS_NAME = "Android"
     _OS_VERSION = "8.0.0"
     _DEVICE_NAME = "star2lte"
diff --git a/yowsup/layers/noise/layer.py b/yowsup/layers/noise/layer.py
index 7423f6f38..71f212c5d 100644
--- a/yowsup/layers/noise/layer.py
+++ b/yowsup/layers/noise/layer.py
@@ -29,14 +29,14 @@
 
 class YowNoiseLayer(YowLayer):
     DEFAULT_PUSHNAME = "yowsup"
-    HEADER = b'WA\x03\x00'
+    HEADER = b'WA\x04\x00'
     EDGE_HEADER = b'ED\x00\x01'
     EVENT_HANDSHAKE_FAILED = "org.whatsapp.yowsup.layer.noise.event.handshake_failed"
 
     def __init__(self):
         super(YowNoiseLayer, self).__init__()
         self._wa_noiseprotocol = WANoiseProtocol(
-            3, 0, protocol_state_callbacks=self._on_protocol_state_changed
+            4, 0, protocol_state_callbacks=self._on_protocol_state_changed
         )  # type: WANoiseProtocol
 
         self._handshake_worker = None