diff --git a/CHANGELOG b/CHANGELOG
index f8c82e1ba97bd996bc639013fad63745e281e59a..dbe5298271123eadc8c068896b1116387e5b3552 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -88,7 +88,6 @@ v 8.11.0 (unreleased)
   - Add archived badge to project list !5798
   - Add simple identifier to public SSH keys (muteor)
   - Admin page now references docs instead of a specific file !5600 (AnAverageHuman)
-  - Add a way to send an email and create an issue based on private personal token. Find the email address from issues page. !3363
   - Fix filter input alignment (ClemMakesApps)
   - Include old revision in merge request update hooks (Ben Boeckel)
   - Add build event color in HipChat messages (David Eisner)
diff --git a/app/models/project.rb b/app/models/project.rb
index f9c48a546e6d1c9aaa0328edfb711e7d00343aba..1855760e694208039f33241fc3ac8f0ee5246c7a 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -611,7 +611,10 @@ class Project < ActiveRecord::Base
   end
 
   def new_issue_address(author)
-    if Gitlab::IncomingEmail.enabled? && author
+    # This feature is disabled for the time being.
+    return nil
+
+    if Gitlab::IncomingEmail.enabled? && author # rubocop:disable Lint/UnreachableCode
       Gitlab::IncomingEmail.reply_address(
         "#{path_with_namespace}+#{author.authentication_token}")
     end
diff --git a/lib/gitlab/email/handler.rb b/lib/gitlab/email/handler.rb
index bd3267e2a80ba54f31753d732b664b19e8838583..5cf9d5ebe28d67be964a8fc4cd9beac8e106dac6 100644
--- a/lib/gitlab/email/handler.rb
+++ b/lib/gitlab/email/handler.rb
@@ -4,7 +4,8 @@ require 'gitlab/email/handler/create_issue_handler'
 module Gitlab
   module Email
     module Handler
-      HANDLERS = [CreateNoteHandler, CreateIssueHandler]
+      # The `CreateIssueHandler` feature is disabled for the time being.
+      HANDLERS = [CreateNoteHandler]
 
       def self.for(mail, mail_key)
         HANDLERS.find do |klass|
diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb
index cb445e22af0a5aeb20bb200bba8205ae826705dd..2e595959f04fbd3a590956eccd2b8297950785bb 100644
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -525,7 +525,7 @@ describe 'Issues', feature: true do
     end
   end
 
-  describe 'new issue by email' do
+  xdescribe 'new issue by email' do
     shared_examples 'show the email in the modal' do
       before do
         stub_incoming_email_setting(enabled: true, address: "p+%{key}@gl.ab")
diff --git a/spec/lib/gitlab/email/handler/create_issue_handler_spec.rb b/spec/lib/gitlab/email/handler/create_issue_handler_spec.rb
index e115315477822703498e05027098ed46dd17747e..a5cc7b02936f339b2fc5d6bd9789b9d8989af8dc 100644
--- a/spec/lib/gitlab/email/handler/create_issue_handler_spec.rb
+++ b/spec/lib/gitlab/email/handler/create_issue_handler_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require_relative '../email_shared_blocks'
 
-describe Gitlab::Email::Handler::CreateIssueHandler, lib: true do
+xdescribe Gitlab::Email::Handler::CreateIssueHandler, lib: true do
   include_context :email_shared_context
   it_behaves_like :email_shared_examples
 
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index d1f3a8152903a6af3d0be932bb18c278f1540bac..9a3660012f995320f35f3ff3f657d7cbcf20786d 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -247,7 +247,7 @@ describe Project, models: true do
     end
   end
 
-  describe "#new_issue_address" do
+  xdescribe "#new_issue_address" do
     let(:project) { create(:empty_project, path: "somewhere") }
     let(:user) { create(:user) }