diff --git a/app/build.gradle b/app/build.gradle
index c81209e3..08668afe 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,22 +24,16 @@ android {
 }
 
 repositories {
+    jcenter()
     mavenCentral()
-    maven { url "http://dl.bintray.com/journeyapps/maven" }
-//    maven { url 'http://clinker.47deg.com/nexus/content/groups/public' }
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.google.android.gms:play-services:8.4.0'
-    compile 'com.google.zxing:core:2.2'
-    compile 'com.journeyapps:zxing-android-embedded:2.3.0@aar'
-    compile 'com.journeyapps:zxing-android-integration:2.3.0@aar'
     compile 'com.android.support:support-v4:24.0.0-alpha2'
     compile 'com.android.support:appcompat-v7:24.0.0-alpha2'
-    compile 'com.google.android.gms:play-services-ads:8.4.0'
-    compile 'com.google.android.gms:play-services-auth:8.4.0'
     compile 'com.google.android.gms:play-services-gcm:8.4.0'
+    compile 'com.journeyapps:zxing-android-embedded:3.4.0'
 }
 
 allprojects {
diff --git a/app/src/main/java/io/Pushjet/api/PushListAdapter.java b/app/src/main/java/io/Pushjet/api/PushListAdapter.java
index 92fe56d5..668a025e 100644
--- a/app/src/main/java/io/Pushjet/api/PushListAdapter.java
+++ b/app/src/main/java/io/Pushjet/api/PushListAdapter.java
@@ -70,7 +70,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
         if (title.equals(""))
             title = entries.get(position).getService().getName();
         String description = entries.get(position).getMessage();
-        Date pushDate = entries.get(position).getLocalTimestamp();
+        Date pushDate = entries.get(position).getTimestamp();
         Bitmap icon = entries.get(position).getService().getIconBitmapOrDefault(context);
 
         dateText.setText(this.df.format(pushDate));
diff --git a/app/src/main/java/io/Pushjet/api/PushjetApi/PushjetMessage.java b/app/src/main/java/io/Pushjet/api/PushjetApi/PushjetMessage.java
index bdc38674..187fe2e8 100644
--- a/app/src/main/java/io/Pushjet/api/PushjetApi/PushjetMessage.java
+++ b/app/src/main/java/io/Pushjet/api/PushjetApi/PushjetMessage.java
@@ -77,10 +77,6 @@ public void setTimestamp(Date timestamp) {
         this.timestamp = timestamp;
     }
 
-    public Date getLocalTimestamp() {
-        return new Date(timestamp.getTime() + TimeZone.getDefault().getOffset(System.currentTimeMillis()));
-    }
-
     public String getTitleOrName() {
         String ret = title;
         if (ret.equals(""))
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ab2fba0d..66da9d62 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -21,6 +21,7 @@
     <string name="perf_server_use_custom">Use custom server</string>
     <string name="pref_server_custom_url">Server URL</string>
     <string name="pref_server_custom_sender_id">Custom Sender ID</string>
+    <string name="pref_server_custom_sender_default">509878466986</string>
     <string name="pref_general_reset">Delete all notifications</string>
     <string name="pref_server_register">Re-register with server</string>
     <string name="pref_server_use_custom_summary">Advanced; for if you don\'t trust our server and/or you want to host it yourself</string>
diff --git a/app/src/main/res/xml/pref_server.xml b/app/src/main/res/xml/pref_server.xml
index c8250125..4fc6e821 100644
--- a/app/src/main/res/xml/pref_server.xml
+++ b/app/src/main/res/xml/pref_server.xml
@@ -21,7 +21,7 @@
         android:dependency="server_use_custom"
         android:key="server_custom_sender_id"
         android:title="@string/pref_server_custom_sender_id"
-        android:defaultValue="509878466986"
+        android:defaultValue="@string/pref_server_custom_sender_default"
         android:selectAllOnFocus="true"
         android:singleLine="true"
         android:inputType="number"/>