From c07f118158af121dbbc7065c29914d372e89fe3b Mon Sep 17 00:00:00 2001
From: Gregor Herdmann <gregor@wire.com>
Date: Tue, 25 Oct 2016 11:47:45 +0200
Subject: [PATCH 1/4] Use proper ephemeral tooltip locale

---
 app/page/template/content/conversation/conversation-input.htm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/page/template/content/conversation/conversation-input.htm b/app/page/template/content/conversation/conversation-input.htm
index b422fbe1819..ed5a91e128a 100644
--- a/app/page/template/content/conversation/conversation-input.htm
+++ b/app/page/template/content/conversation/conversation-input.htm
@@ -47,7 +47,7 @@
             <!-- ko if: conversation_et().is_one2one() -->
               <span id="conversation-input-ephemeral"
                     class="controls-right-button conversation-input-ephemeral"
-                    data-bind="l10n_tooltip: z.string.de.tooltip_conversation_ephemeral"
+                    data-bind="l10n_tooltip: z.string.tooltip_conversation_ephemeral"
                     data-uie-name="do-set-ephemeral-timer">
                 <!-- ko if: conversation_et().ephemeral_timer() -->
                   <div class="ephemeral-timer-button">

From a2bade6ab7afafe2636b4a8ed022621c5ea94ea4 Mon Sep 17 00:00:00 2001
From: Gregor Herdmann <gregor@wire.com>
Date: Tue, 25 Oct 2016 13:29:45 +0200
Subject: [PATCH 2/4] Improve error handling for sending queue

---
 app/script/conversation/ConversationRepository.coffee | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/script/conversation/ConversationRepository.coffee b/app/script/conversation/ConversationRepository.coffee
index e0f12c03a53..19e99cd89a8 100644
--- a/app/script/conversation/ConversationRepository.coffee
+++ b/app/script/conversation/ConversationRepository.coffee
@@ -141,10 +141,10 @@ class z.conversation.ConversationRepository
       @sending_blocked = true
       @sending_interval = window.setInterval =>
         return if @conversation_service.client.request_queue_blocked_state() isnt z.service.RequestQueueBlockedState.NONE
-        @logger.log @logger.levels.ERROR, 'Sending of message from queue failed, unblocking queue', {entry_function: @sending_queue()[0].function, queue: @sending_queue()}
         @sending_blocked = false
-        @_execute_from_sending_queue()
         window.clearInterval @sending_interval
+        @logger.log @logger.levels.ERROR, 'Sending of message from queue failed, unblocking queue', @sending_queue()
+        @_execute_from_sending_queue()
       , z.config.SENDING_QUEUE_UNBLOCK_INTERVAL
 
       queue_entry.function()

From 2c13ac0f57f8966b748fdacf2d1947a8962b9d49 Mon Sep 17 00:00:00 2001
From: Gregor Herdmann <gregor@wire.com>
Date: Tue, 25 Oct 2016 16:54:55 +0200
Subject: [PATCH 3/4] Downgrade to latest node 6 version

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5d03fd273c6..dafc8009b6a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,7 @@ addons:
 # http://docs.travis-ci.com/user/languages/javascript-with-nodejs/
 language: node_js
 node_js:
-  - node
+  - 6
 
 # https://blog.travis-ci.com/2013-12-05-speed-up-your-builds-cache-your-dependencies
 cache:

From cd77e8d4a7a4b29b3f0bfbedf985db137b47e4e9 Mon Sep 17 00:00:00 2001
From: rehez <rene@wearezeta.com>
Date: Tue, 25 Oct 2016 17:03:17 +0200
Subject: [PATCH 4/4] Fix 3317 and 3318

---
 app/script/view_model/MessageListViewModel.coffee | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/script/view_model/MessageListViewModel.coffee b/app/script/view_model/MessageListViewModel.coffee
index 6f7c9ec7e6f..a46a6f648ff 100644
--- a/app/script/view_model/MessageListViewModel.coffee
+++ b/app/script/view_model/MessageListViewModel.coffee
@@ -383,7 +383,7 @@ class z.ViewModel.MessageListViewModel
 
     @_track_context_menu message_et
 
-    if message_et.has_asset()
+    if message_et.has_asset() and not message_et.is_expired()
       entries.push {label: z.string.conversation_context_menu_download, action: 'download'}
 
     if message_et.is_reactable() and not @conversation().removed_from_conversation()
@@ -445,7 +445,7 @@ class z.ViewModel.MessageListViewModel
   ###
   show_detail: (asset_et, event) ->
     target_element = $(event.currentTarget)
-    return if target_element.hasClass 'image-ephemeral'
+    return if target_element.hasClass 'bg-color-ephemeral'
     return if target_element.hasClass 'image-loading'
     amplify.publish z.event.WebApp.CONVERSATION.DETAIL_VIEW.SHOW, target_element.find('img')[0].src