diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift
index 2afda5784..d4b81425f 100644
--- a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift
+++ b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
 //
 
 import UIKit
@@ -81,6 +81,7 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate {
         editorGestureRecognizer.canvasView = layersView
         self.addGestureRecognizer(editorGestureRecognizer)
         self.editorGestureRecognizer = editorGestureRecognizer
+        editorGestureRecognizer.isEnabled = false
 
         return true
     }
@@ -188,10 +189,8 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate {
     private func updateButtons() {
         undoButton.isEnabled = model.canUndo()
         redoButton.isEnabled = model.canRedo()
-//        brushButton.isSelected = editorMode == .brush
-        brushButton.isEnabled = editorMode != .brush
-//        cropButton.isSelected = editorMode == .crop
-        cropButton.isEnabled = editorMode != .crop
+        brushButton.isSelected = editorMode == .brush
+        cropButton.isSelected = editorMode == .crop
     }
 
     // MARK: - Actions
@@ -217,14 +216,21 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate {
     @objc func didTapBrush(sender: UIButton) {
         Logger.verbose("")
 
-        editorMode = .brush
-        updateButtons()
+        toggle(editorMode: .brush)
     }
 
     @objc func didTapCrop(sender: UIButton) {
         Logger.verbose("")
 
-        editorMode = .crop
+        toggle(editorMode: .crop)
+    }
+
+    func toggle(editorMode: EditorMode) {
+        if self.editorMode == editorMode {
+            self.editorMode = .none
+        } else {
+            self.editorMode = editorMode
+        }
         updateButtons()
     }
 
diff --git a/SignalMessaging/attachments/SignalAttachment.swift b/SignalMessaging/attachments/SignalAttachment.swift
index 5cf30fb3a..7580d1cfb 100644
--- a/SignalMessaging/attachments/SignalAttachment.swift
+++ b/SignalMessaging/attachments/SignalAttachment.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
 //
 
 import Foundation
@@ -193,7 +193,7 @@ public class SignalAttachment: NSObject {
     // MARK: 
 
     @objc
-    public static let isMultiSendEnabled = false
+    public static let isMultiSendEnabled = _isDebugAssertConfiguration()
 
     @objc
     public static var maxAttachmentsAllowed: Int {