diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java
index ac5ee5004c..b93ae4ab65 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java
@@ -14,6 +14,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.ApplicationContext;
+import org.thoughtcrime.securesms.conversation.v2.components.ExpirationTimerView;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.service.ExpiringMessageManager;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ExpirationTimerView.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/ExpirationTimerView.java
similarity index 98%
rename from app/src/main/java/org/thoughtcrime/securesms/components/ExpirationTimerView.java
rename to app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/ExpirationTimerView.java
index 65cad0a274..5a04e77ac2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ExpirationTimerView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/ExpirationTimerView.java
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.components;
+package org.thoughtcrime.securesms.conversation.v2.components;
 
 import android.content.Context;
 import androidx.annotation.NonNull;
@@ -118,5 +118,4 @@ public class ExpirationTimerView extends androidx.appcompat.widget.AppCompatImag
       Util.runOnMainDelayed(this, timerView.calculateAnimationDelay(timerView.startedAt, timerView.expiresIn));
     }
   }
-
 }
diff --git a/app/src/main/res/layout/conversation_item_footer.xml b/app/src/main/res/layout/conversation_item_footer.xml
index 740234f0e9..ab16a09304 100644
--- a/app/src/main/res/layout/conversation_item_footer.xml
+++ b/app/src/main/res/layout/conversation_item_footer.xml
@@ -26,7 +26,7 @@
             android:textAllCaps="true"
             tools:text="30 mins"/>
 
-        <org.thoughtcrime.securesms.components.ExpirationTimerView
+        <org.thoughtcrime.securesms.conversation.v2.components.ExpirationTimerView
             android:id="@+id/footer_expiration_timer"
             android:layout_gravity="center_vertical|end"
             android:layout_marginStart="6dp"