diff --git a/Self-destructing-messages.md b/Self-destructing-messages.md
index 70957e0..f830ab8 100644
--- a/Self-destructing-messages.md
+++ b/Self-destructing-messages.md
@@ -31,8 +31,46 @@ Tappable Link that says: learn more
 - [ ] Information screen is scrollable in landscape orientation and all the links still work (back button in navigation bar and Got it in the right hand side bottom corner)
 - [ ] <When the user on device 1 starts typing the next message to the user on device2, there is a little bomb icon in the text field itself, to remind the user that they are typing a message that will disappear
 - [ ] After device1 sends the message to the device2, both users are informed that the messages will disappear (automatically generated information messages on their sceens that inform them that messages will disappear after a period of time - not configurable by user). 
+- [ ] After the device1 sends a disappearing message to the device2, this act will change the device2 disappearing setting: if it is 'off' it will change it to 'on'.
 - [ ] Device 1 user sees a little bomb icon on their sent message, and the device2 user sees the little bomb icon on the message they received. 
 - [ ] The messages disappear after the stated time interval  
+- [ ] Tested with both devices having this setting 'on', one 'on' and one 'off', changing the setting from either device during conversation, portrait and landscape, and both devices having this setting 'off'. 
+
+**#1864 Show warning dialog when the expected timer differs from the current timer **
+
+We mirror the timer duration from our contact's messages. It is possible that we are writing a message and short before we hit send, the timer changes or gets turned off. To prevent this scenario, we should show a warning dialog that pops up if the timer when sending is different from the timer when we started typing the message.
+
+
+**MR 1328 Show warning dialog when the expected timer differs from the current timer **
+
+This MR refactors message sending to return a LiveData that the TextSendController can observe to react to the sending state. The main reason is to be able to reliably catch automatic changes to the auto-delete timer which might surprise the user.
+
+Test instructions:
+
+* Add a contact, open private conversation screen and send a message
+* Start typing a second message and activate disappearing messages, finish typing the message and send
+  * check that a warning message appears warning about the changed timer
+* Start typing a third message, but don't send
+* Let your contact disable disappearing messages and send a message
+* Wait for the contact's message to arrive and then send your message
+  * check that a warning message appears warning about the changed timer
+
+**Test Specification**
+
+Preconditions: 
+- [ ] Delete all messages between the device1 and Device2, if there are any. 
+- [ ] Send a few non-disappearing messages between the two devices
+- [ ] Device1 start typing a message to device 2, device 2 change the disappearing messages setting to 'on' and start typing a message to device1
+- [ ] device2 sends its message to device1, device 1 sends it message to device 2
+- [ ] Device 2 sees an automatically generates message on their screen: Disappearing messages changed.  Since you started composing your message, disappearing messages have changed'.  ON this warning message, options for the user are: 'send anyway' and 'cancel'.  
+- [ ] Tapping on 'cancel' cancels the warning message and returns the user back to the mesage composing screen.
+- [ ] Tapping on 'Send anyway' sends the message to the device1
+- [ ] Device 1 receives the disappearing message, and there is the 'device2's message, containing little bomb icon, there is an automatically generated message to say that device2's message will disappear after a period of time, and there is a little icon on the device1 text input field.  
+- [ ] Device1 setting 'disappearing messages' has been turned 'on' when they received the device2 disappearing message. 
+- [ ] When device1 tries to send the message they were composing, they receive the same warning as did device2 when they changed this setting in the middle of composing the message: Disappearing messages changed.  Since you started composing your message, disappearing messages have changed'.  ON this warning message, options for the user are: 'send anyway' and 'cancel'.  
+
+
+