diff --git a/res/layout-sw400dp/activity_register.xml b/res/layout-sw400dp/activity_register.xml
index 6245f922bc..8cc432c160 100644
--- a/res/layout-sw400dp/activity_register.xml
+++ b/res/layout-sw400dp/activity_register.xml
@@ -30,7 +30,7 @@
         android:textColor="@color/text"
         android:text="@string/activity_register_explanation" />
 
-    <org.thoughtcrime.securesms.loki.views.TapJackingProofTextView
+    <TextView
         style="@style/SessionIDTextView"
         android:id="@+id/publicKeyTextView"
         android:layout_width="match_parent"
@@ -54,7 +54,7 @@
         android:layout_marginRight="@dimen/massive_spacing"
         android:text="@string/continue_2" />
 
-    <org.thoughtcrime.securesms.loki.views.TapJackingProofButton
+    <Button
         style="@style/Widget.Session.Button.Common.ProminentOutline"
         android:id="@+id/copyButton"
         android:layout_width="match_parent"
diff --git a/res/layout-sw400dp/activity_seed.xml b/res/layout-sw400dp/activity_seed.xml
index e4bfd63a82..74f44a79d4 100644
--- a/res/layout-sw400dp/activity_seed.xml
+++ b/res/layout-sw400dp/activity_seed.xml
@@ -36,7 +36,7 @@
         android:textColor="@color/text"
         android:text="@string/activity_seed_explanation" />
 
-    <org.thoughtcrime.securesms.loki.views.TapJackingProofTextView
+    <TextView
         style="@style/SessionIDTextView"
         android:id="@+id/seedTextView"
         android:layout_width="match_parent"
@@ -49,7 +49,7 @@
         android:textAlignment="center"
         android:text="nautical novelty populate onion awkward bent etiquette plant submarine itches vipers september axis maximum populate" />
 
-    <org.thoughtcrime.securesms.loki.views.TapJackingProofTextView
+    <TextView
         android:id="@+id/revealButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -65,7 +65,7 @@
         android:layout_height="0dp"
         android:layout_weight="1"/>
 
-    <org.thoughtcrime.securesms.loki.views.TapJackingProofButton
+    <Button
         style="@style/Widget.Session.Button.Common.ProminentOutline"
         android:id="@+id/copyButton"
         android:layout_width="196dp"
diff --git a/res/layout-sw400dp/fragment_enter_public_key.xml b/res/layout-sw400dp/fragment_enter_public_key.xml
index 9defb4fd35..9acdc7e6db 100644
--- a/res/layout-sw400dp/fragment_enter_public_key.xml
+++ b/res/layout-sw400dp/fragment_enter_public_key.xml
@@ -50,7 +50,7 @@
         android:layout_marginTop="@dimen/large_spacing"
         android:layout_marginRight="@dimen/large_spacing" />
 
-    <org.thoughtcrime.securesms.loki.views.TapJackingProofTextView
+    <TextView
         android:id="@+id/publicKeyTextView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -71,7 +71,7 @@
         android:layout_marginRight="@dimen/large_spacing"
         android:orientation="horizontal">
 
-        <org.thoughtcrime.securesms.loki.views.TapJackingProofButton
+        <Button
             style="@style/Widget.Session.Button.Common.UnimportantFilled"
             android:id="@+id/copyButton"
             android:layout_width="0dp"
@@ -79,7 +79,7 @@
             android:layout_weight="1"
             android:text="@string/copy" />
 
-        <org.thoughtcrime.securesms.loki.views.TapJackingProofButton
+        <Button
             style="@style/Widget.Session.Button.Common.UnimportantFilled"
             android:id="@+id/shareButton"
             android:layout_width="0dp"
diff --git a/res/layout/activity_register.xml b/res/layout/activity_register.xml
index 0a779fe39c..57a64e2fb3 100644
--- a/res/layout/activity_register.xml
+++ b/res/layout/activity_register.xml
@@ -30,7 +30,7 @@
         android:textColor="@color/text"
         android:text="@string/activity_register_explanation" />
 
-    <org.thoughtcrime.securesms.loki.views.TapJackingProofTextView
+    <TextView
         style="@style/SessionIDTextView"
         android:id="@+id/publicKeyTextView"
         android:layout_width="match_parent"
@@ -55,7 +55,7 @@
         android:layout_marginRight="@dimen/massive_spacing"
         android:text="@string/continue_2" />
 
-    <org.thoughtcrime.securesms.loki.views.TapJackingProofButton
+    <Button
         style="@style/Widget.Session.Button.Common.ProminentOutline"
         android:id="@+id/copyButton"
         android:layout_width="match_parent"
diff --git a/res/layout/activity_seed.xml b/res/layout/activity_seed.xml
index ce1576f7aa..8aacbf3df3 100644
--- a/res/layout/activity_seed.xml
+++ b/res/layout/activity_seed.xml
@@ -36,7 +36,7 @@
         android:textColor="@color/text"
         android:text="@string/activity_seed_explanation" />
 
-    <org.thoughtcrime.securesms.loki.views.TapJackingProofTextView
+    <TextView
         style="@style/SessionIDTextView"
         android:id="@+id/seedTextView"
         android:layout_width="match_parent"
@@ -49,7 +49,7 @@
         android:textAlignment="center"
         android:text="nautical novelty populate onion awkward bent etiquette plant submarine itches vipers september axis maximum populate" />
 
-    <org.thoughtcrime.securesms.loki.views.TapJackingProofTextView
+    <TextView
         android:id="@+id/revealButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -66,7 +66,7 @@
         android:layout_height="0dp"
         android:layout_weight="1"/>
 
-    <org.thoughtcrime.securesms.loki.views.TapJackingProofButton
+    <Button
         style="@style/Widget.Session.Button.Common.ProminentOutline"
         android:id="@+id/copyButton"
         android:layout_width="196dp"
diff --git a/res/layout/dialog_seed.xml b/res/layout/dialog_seed.xml
index 57cb48eae0..35fe564c20 100644
--- a/res/layout/dialog_seed.xml
+++ b/res/layout/dialog_seed.xml
@@ -20,7 +20,7 @@
         android:textAlignment="center"
         android:textSize="@dimen/medium_font_size" />
 
-    <org.thoughtcrime.securesms.loki.views.TapJackingProofTextView
+    <TextView
         style="@style/SessionIDTextView"
         android:id="@+id/seedTextView"
         android:layout_width="wrap_content"
@@ -56,7 +56,7 @@
             android:layout_weight="1"
             android:text="@string/cancel" />
 
-        <org.thoughtcrime.securesms.loki.views.TapJackingProofButton
+        <Button
             style="@style/Widget.Session.Button.Dialog.Unimportant"
             android:id="@+id/copyButton"
             android:layout_width="0dp"
diff --git a/res/layout/fragment_enter_public_key.xml b/res/layout/fragment_enter_public_key.xml
index 25cc353f3d..ffd53dd34e 100644
--- a/res/layout/fragment_enter_public_key.xml
+++ b/res/layout/fragment_enter_public_key.xml
@@ -49,7 +49,7 @@
         android:layout_marginTop="@dimen/large_spacing"
         android:layout_marginRight="@dimen/large_spacing" />
 
-    <org.thoughtcrime.securesms.loki.views.TapJackingProofTextView
+    <TextView
         android:id="@+id/publicKeyTextView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -70,7 +70,7 @@
         android:layout_marginRight="@dimen/large_spacing"
         android:orientation="horizontal">
 
-        <org.thoughtcrime.securesms.loki.views.TapJackingProofButton
+        <Button
             style="@style/Widget.Session.Button.Common.UnimportantFilled"
             android:id="@+id/copyButton"
             android:layout_width="0dp"
@@ -78,7 +78,7 @@
             android:layout_weight="1"
             android:text="@string/copy" />
 
-        <org.thoughtcrime.securesms.loki.views.TapJackingProofButton
+        <Button
             style="@style/Widget.Session.Button.Common.UnimportantFilled"
             android:id="@+id/shareButton"
             android:layout_width="0dp"
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
index 612d9d3455..d62033af6a 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
@@ -89,7 +89,6 @@ import org.thoughtcrime.securesms.linkpreview.LinkPreviewUtil;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.loki.utilities.MentionUtilities;
 import org.thoughtcrime.securesms.loki.views.ProfilePictureView;
-import org.thoughtcrime.securesms.loki.views.TapJackingProofLinearLayout;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.ImageSlide;
 import org.thoughtcrime.securesms.mms.PartAuthority;
@@ -130,7 +129,7 @@ import network.loki.messenger.R;
  *
  */
 
-public class ConversationItem extends TapJackingProofLinearLayout
+public class ConversationItem extends LinearLayout
     implements RecipientModifiedListener, BindableConversationItem
 {
   private static final String TAG = ConversationItem.class.getSimpleName();