diff --git a/config/common.mk b/config/common.mk
index 702f9ec94abdfffeb3bf24dfd8669576025a7840..afe387ace4d3f23aeb100614efa6dd9513b78f13 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -32,7 +32,6 @@ PRODUCT_PACKAGES += \
     Tasks \
     DroidGuard \
     OpenKeychain \
-    Message \
     Browser \
     BrowserWebView \
     Apps \
diff --git a/config/telephony.mk b/config/telephony.mk
index 2946e0363b26f3b668cbaa31ff5c188dd3b0c9d7..6754e59d23691af953e5f7c8b71ee46cf5e1e0f4 100644
--- a/config/telephony.mk
+++ b/config/telephony.mk
@@ -1,3 +1,6 @@
 # Default ringtone
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.config.ringtone=Dione.ogg
+
+PRODUCT_PACKAGES += \
+    Message