diff --git a/IPython/core/inputtransformer2.py b/IPython/core/inputtransformer2.py
index c7deab8..fc9d342 100644
--- a/IPython/core/inputtransformer2.py
+++ b/IPython/core/inputtransformer2.py
@@ -89,7 +89,28 @@ classic_prompt = PromptStripper(
     initial_re=re.compile(r'^>>>( |$)')
 )
 
-ipython_prompt = PromptStripper(re.compile(r'^(In \[\d+\]: |\s*\.{3,}: ?)'))
+ipython_prompt = PromptStripper(re.compile(
+    r'''
+    ^(                         # Match from the beginning of a line, either:
+
+                               # 1. First-line prompt:
+    ((\[nav\]|\[ins\])?\ )?    # Vi editing mode prompt, if it's there
+    In\                        # The 'In' of the prompt, with a space
+    \[\d+\]:                   # Command index, as displayed in the prompt
+    \                          # With a mandatory trailing space
+
+    |                          # ... or ...
+
+                               # 2. The three dots of the multiline prompt
+    \s*                        # All leading whitespace characters
+    \.{3,}:                    # The three (or more) dots
+    \ ?                        # With an optional trailing space
+
+    )
+    ''',
+    re.VERBOSE
+))
+
 
 def cell_magic(lines):
     if not lines or not lines[0].startswith('%%'):