diff --git a/app/builders/messages/message_builder.rb b/app/builders/messages/message_builder.rb
index 12a74ed9c..857d901e5 100644
--- a/app/builders/messages/message_builder.rb
+++ b/app/builders/messages/message_builder.rb
@@ -23,7 +23,7 @@ class Messages::MessageBuilder
     process_emails
     # When the message has no quoted content, it will just be rendered as a regular message
     # The frontend is equipped to handle this case
-    process_email_content if @account.feature_enabled?(:quoted_email_reply)
+    process_email_content
     @message.save!
     @message
   end
diff --git a/spec/builders/messages/message_builder_spec.rb b/spec/builders/messages/message_builder_spec.rb
index 2eb4dbf90..64a1aad62 100644
--- a/spec/builders/messages/message_builder_spec.rb
+++ b/spec/builders/messages/message_builder_spec.rb
@@ -199,19 +199,6 @@ describe Messages::MessageBuilder do
           expect(message.content_attributes.dig('email', 'text_content', 'reply')).to eq 'Regular message content'
         end
 
-        it 'does not process custom email content when quoted_email_reply feature is disabled' do
-          account.disable_features('quoted_email_reply')
-          params = ActionController::Parameters.new({
-                                                      content: 'Regular message content',
-                                                      email_html_content: '<p>Custom HTML content</p>'
-                                                    })
-
-          message = described_class.new(user, conversation, params).perform
-
-          expect(message.content_attributes.dig('email', 'html_content')).to be_nil
-          expect(message.content_attributes.dig('email', 'text_content')).to be_nil
-        end
-
         it 'does not process custom email content for private messages' do
           params = ActionController::Parameters.new({
                                                       content: 'Regular message content',