diff --git a/src/org/thoughtcrime/securesms/mms/ApnDefaults.java b/src/org/thoughtcrime/securesms/mms/ApnDefaults.java
index cd5e358f76..1f49c8bbc5 100644
--- a/src/org/thoughtcrime/securesms/mms/ApnDefaults.java
+++ b/src/org/thoughtcrime/securesms/mms/ApnDefaults.java
@@ -21,6 +21,11 @@ public class ApnDefaults {
             //T-Mobile USA - Tested: Works
             put("310260", new MmsConnectionParameters("http://mms.msg.eng.t-mobile.com/mms/wapenc", null, null));
 
+            //T-Mobile UK - Untested (http://www.unlockme.co.uk/network-provider-codes.html)
+            put("23430", new MmsConnectionParameters("http://mmsc.t-mobile.co.uk:8002", "149.254.201.135","8080"));
+            put("23431", new MmsConnectionParameters("http://mmsc.t-mobile.co.uk:8002", "149.254.201.135","8080"));
+            put("23432", new MmsConnectionParameters("http://mmsc.t-mobile.co.uk:8002", "149.254.201.135","8080"));
+
             //AT&T - Testd
             put("310410", (new MmsConnectionParameters("http://mmsc.cingular.com", "wireless.cingular.com", "80"))
                                                   .add("http://mmsc.mobile.att.net", "proxy.mobile.att.net", "80"));
@@ -128,7 +133,6 @@ public class ApnDefaults {
             put("23410", new MmsConnectionParameters("http://mmsc.mms.o2.co.uk:8002", "82.132.254.1", "8080"));
             put("23415", new MmsConnectionParameters("http://mms.vodafone.co.uk/servlets/mms", "212.183.137.12", "8799"));
             put("23420", new MmsConnectionParameters("http://mms.um.three.co.uk:10021/mmsc", "mms.three.co.uk", "8799"));
-            put("23430", new MmsConnectionParameters("http://mms.orange.co.uk/", "192.168.224.10", "8080"));
             put("23433", new MmsConnectionParameters("http://mms.orange.co.uk/", "192.168.224.10", "8080"));
             put("23801", new MmsConnectionParameters("http://mmsc.tdc.dk:8002", "194.182.251.15", "8080"));
             put("23802", new MmsConnectionParameters("http://mms.telenor.dk", "212.88.64.8", "8080"));