diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptMessageJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptMessageJob.java
index 2ebb3e4bbf..e87cef64df 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptMessageJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptMessageJob.java
@@ -172,7 +172,7 @@ public final class PushDecryptMessageJob extends BaseJob {
       return jobs;
 
     } catch (ProtocolInvalidVersionException e) {
-      Log.w(TAG, e);
+      Log.w(TAG, String.valueOf(envelope.getTimestamp()), e);
       return Collections.singletonList(new PushProcessMessageJob(PushProcessMessageJob.MessageState.INVALID_VERSION,
                                                                  toExceptionMetadata(e),
                                                                  messageId,
@@ -180,7 +180,7 @@ public final class PushDecryptMessageJob extends BaseJob {
                                                                  envelope.getTimestamp()));
 
     } catch (ProtocolInvalidMessageException | ProtocolInvalidKeyIdException | ProtocolInvalidKeyException | ProtocolUntrustedIdentityException e) {
-      Log.w(TAG, e);
+      Log.w(TAG, String.valueOf(envelope.getTimestamp()), e);
       return Collections.singletonList(new PushProcessMessageJob(PushProcessMessageJob.MessageState.CORRUPT_MESSAGE,
                                                                  toExceptionMetadata(e),
                                                                  messageId,
@@ -188,7 +188,7 @@ public final class PushDecryptMessageJob extends BaseJob {
                                                                  envelope.getTimestamp()));
 
     } catch (ProtocolNoSessionException e) {
-      Log.w(TAG, e);
+      Log.w(TAG, String.valueOf(envelope.getTimestamp()), e);
       return Collections.singletonList(new PushProcessMessageJob(PushProcessMessageJob.MessageState.NO_SESSION,
                                                                  toExceptionMetadata(e),
                                                                  messageId,
@@ -196,7 +196,7 @@ public final class PushDecryptMessageJob extends BaseJob {
                                                                  envelope.getTimestamp()));
 
     } catch (ProtocolLegacyMessageException e) {
-      Log.w(TAG, e);
+      Log.w(TAG, String.valueOf(envelope.getTimestamp()), e);
       return Collections.singletonList(new PushProcessMessageJob(PushProcessMessageJob.MessageState.LEGACY_MESSAGE,
                                                                  toExceptionMetadata(e),
                                                                  messageId,
@@ -204,7 +204,7 @@ public final class PushDecryptMessageJob extends BaseJob {
                                                                  envelope.getTimestamp()));
 
     } catch (ProtocolDuplicateMessageException e) {
-      Log.w(TAG, e);
+      Log.w(TAG, String.valueOf(envelope.getTimestamp()), e);
       return Collections.singletonList(new PushProcessMessageJob(PushProcessMessageJob.MessageState.DUPLICATE_MESSAGE,
                                                                  toExceptionMetadata(e),
                                                                  messageId,
@@ -212,7 +212,7 @@ public final class PushDecryptMessageJob extends BaseJob {
                                                                  envelope.getTimestamp()));
 
     } catch (InvalidMetadataVersionException | InvalidMetadataMessageException e) {
-      Log.w(TAG, e);
+      Log.w(TAG, String.valueOf(envelope.getTimestamp()), e);
       return Collections.emptyList();
 
     } catch (SelfSendException e) {
@@ -220,7 +220,7 @@ public final class PushDecryptMessageJob extends BaseJob {
       return Collections.emptyList();
 
     } catch (UnsupportedDataMessageException e) {
-      Log.w(TAG, e);
+      Log.w(TAG, String.valueOf(envelope.getTimestamp()), e);
       return Collections.singletonList(new PushProcessMessageJob(PushProcessMessageJob.MessageState.UNSUPPORTED_DATA_MESSAGE,
                                        toExceptionMetadata(e),
                                        messageId,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.java
index 080f0c6800..4a98b2809a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.java
@@ -458,37 +458,37 @@ public final class PushProcessMessageJob extends BaseJob {
     switch (messageState) {
 
       case INVALID_VERSION:
-        Log.w(TAG, "Handling invalid version");
+        Log.w(TAG, "Handling invalid version (" + timestamp + ")");
         handleInvalidVersionMessage(e.sender, e.senderDevice, timestamp, smsMessageId);
         break;
 
       case CORRUPT_MESSAGE:
-        Log.w(TAG, "Handling corrupt message");
+        Log.w(TAG, "Handling corrupt message (" + timestamp + ")");
         handleCorruptMessage(e.sender, e.senderDevice, timestamp, smsMessageId);
         break;
 
       case NO_SESSION:
-        Log.w(TAG, "Handling no session");
+        Log.w(TAG, "Handling no session (" + timestamp + ")");
         handleNoSessionMessage(e.sender, e.senderDevice, timestamp, smsMessageId);
         break;
 
       case LEGACY_MESSAGE:
-        Log.w(TAG, "Handling legacy message");
+        Log.w(TAG, "Handling legacy message (" + timestamp + ")");
         handleLegacyMessage(e.sender, e.senderDevice, timestamp, smsMessageId);
         break;
 
       case DUPLICATE_MESSAGE:
-        Log.w(TAG, "Handling duplicate message");
+        Log.w(TAG, "Handling duplicate message (" + timestamp + ")");
         handleDuplicateMessage(e.sender, e.senderDevice, timestamp, smsMessageId);
         break;
 
       case UNSUPPORTED_DATA_MESSAGE:
-        Log.w(TAG, "Handling unsupported data message");
+        Log.w(TAG, "Handling unsupported data message (" + timestamp + ")");
         handleUnsupportedDataMessage(e.sender, e.senderDevice, Optional.fromNullable(e.groupId), timestamp, smsMessageId);
         break;
 
       default:
-        throw new AssertionError("Not handled " + messageState);
+        throw new AssertionError("Not handled " + messageState + ". (" + timestamp + ")");
     }
   }