diff --git a/UI/ControlMappingScreen.cpp b/UI/ControlMappingScreen.cpp
index a7c65f6191..fa66b4857e 100644
--- a/UI/ControlMappingScreen.cpp
+++ b/UI/ControlMappingScreen.cpp
@@ -212,6 +212,12 @@ void ControlMappingScreen::CreateViews() {
 	}
 }
 
+void ControlMappingScreen::sendMessage(const char *message, const char *value) {
+	if (!strcmp(message, "language")) {
+		screenManager()->RecreateAllViews();
+	}
+}
+
 UI::EventReturn ControlMappingScreen::OnBack(UI::EventParams &e) {
 	// If we're in-game, return to the game via DR_CANCEL.
 	if(PSP_IsInited()) {
diff --git a/UI/ControlMappingScreen.h b/UI/ControlMappingScreen.h
index fb22a8d7f0..a8a489648c 100644
--- a/UI/ControlMappingScreen.h
+++ b/UI/ControlMappingScreen.h
@@ -28,6 +28,7 @@ public:
 	ControlMappingScreen() {}
 protected:
 	virtual void CreateViews();
+	virtual void sendMessage(const char *message, const char *value);
 	virtual UI::EventReturn OnBack(UI::EventParams &e);
 
 private:
diff --git a/UI/CwCheatScreen.cpp b/UI/CwCheatScreen.cpp
index 6f88aecb66..59d58d3738 100644
--- a/UI/CwCheatScreen.cpp
+++ b/UI/CwCheatScreen.cpp
@@ -93,6 +93,12 @@ void CwCheatScreen::CreateViews() {
 	}
 }
 
+void CwCheatScreen::sendMessage(const char *message, const char *value) {
+	if (!strcmp(message, "language")) {
+		screenManager()->RecreateAllViews();
+	}
+}
+
 UI::EventReturn CwCheatScreen::OnBack(UI::EventParams &params)
 {
 	screenManager()->finishDialog(this, DR_OK);
diff --git a/UI/CwCheatScreen.h b/UI/CwCheatScreen.h
index 4ad4764a94..4ff0250395 100644
--- a/UI/CwCheatScreen.h
+++ b/UI/CwCheatScreen.h
@@ -42,6 +42,7 @@ public:
 	UI::EventReturn OnEnableAll(UI::EventParams &params);
 protected:
 	virtual void CreateViews();
+	virtual void sendMessage(const char *message, const char *value);
 
 private:
 	UI::EventReturn OnCheckBox(UI::EventParams &params);
diff --git a/native b/native
index 67183f5822..df8814e239 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit 67183f5822c3e28b51bb06b754e002c737feeccf
+Subproject commit df8814e239531ba87a950e278f6236e85ef44b4b