diff --git a/library/src/org/whispersystems/textsecure/push/IncomingPushMessage.java b/library/src/org/whispersystems/textsecure/push/IncomingPushMessage.java
index a924f248ab..d4f753469a 100644
--- a/library/src/org/whispersystems/textsecure/push/IncomingPushMessage.java
+++ b/library/src/org/whispersystems/textsecure/push/IncomingPushMessage.java
@@ -21,7 +21,7 @@ import android.os.Parcelable;
 
 import org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal;
 
-public class IncomingPushMessage implements PushMessage, Parcelable {
+public class IncomingPushMessage implements Parcelable {
 
   public static final Parcelable.Creator<IncomingPushMessage> CREATOR = new Parcelable.Creator<IncomingPushMessage>() {
     @Override
diff --git a/library/src/org/whispersystems/textsecure/push/OutgoingPushMessage.java b/library/src/org/whispersystems/textsecure/push/OutgoingPushMessage.java
index ea797ec346..a0b42e2421 100644
--- a/library/src/org/whispersystems/textsecure/push/OutgoingPushMessage.java
+++ b/library/src/org/whispersystems/textsecure/push/OutgoingPushMessage.java
@@ -18,7 +18,7 @@ package org.whispersystems.textsecure.push;
 
 import org.whispersystems.textsecure.util.Base64;
 
-public class OutgoingPushMessage implements PushMessage {
+public class OutgoingPushMessage {
 
   private int    type;
   private int    destinationDeviceId;
diff --git a/src/org/thoughtcrime/securesms/transport/PushTransport.java b/src/org/thoughtcrime/securesms/transport/PushTransport.java
index 08db3558a0..34ae9c8594 100644
--- a/src/org/thoughtcrime/securesms/transport/PushTransport.java
+++ b/src/org/thoughtcrime/securesms/transport/PushTransport.java
@@ -61,6 +61,8 @@ import ws.com.google.android.mms.ContentType;
 import ws.com.google.android.mms.pdu.PduBody;
 import ws.com.google.android.mms.pdu.SendReq;
 
+import static org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal;
+
 public class PushTransport extends BaseTransport {
 
   private final Context      context;
@@ -315,9 +317,9 @@ public class PushTransport extends BaseTransport {
     CiphertextMessage message = cipher.encrypt(plaintext);
 
     if (message.getType() == CiphertextMessage.PREKEY_WHISPER_TYPE) {
-      return new PushBody(OutgoingPushMessage.TYPE_MESSAGE_PREKEY_BUNDLE, message.serialize());
+      return new PushBody(IncomingPushMessageSignal.Type.PREKEY_BUNDLE_VALUE, message.serialize());
     } else if (message.getType() == CiphertextMessage.CURRENT_WHISPER_TYPE) {
-      return new PushBody(OutgoingPushMessage.TYPE_MESSAGE_CIPHERTEXT, message.serialize());
+      return new PushBody(IncomingPushMessageSignal.Type.CIPHERTEXT_VALUE, message.serialize());
     } else {
       throw new AssertionError("Unknown ciphertext type: " + message.getType());
     }