diff --git a/core/language/en-GB/Misc.multids b/core/language/en-GB/Misc.multids
index 651f0eab7..5da4bc090 100644
--- a/core/language/en-GB/Misc.multids
+++ b/core/language/en-GB/Misc.multids
@@ -3,4 +3,6 @@ title: $:/language/
 RecentChanges/DateFormat: DDth MMM YYYY
 CloseAll/Button: close all
 MissingTiddler/Hint: Missing tiddler "<$text text=<<currentTiddler>>/>" - click {{$:/core/images/edit-button}} to create
-SystemTiddler/Tooltip: This is a system tiddler
\ No newline at end of file
+SystemTiddler/Tooltip: This is a system tiddler
+ClassicWarning/Hint: This tiddler is written in TiddlyWiki Classic wiki text format, which is not fully compatible with TiddlyWiki version 5. See http://tiddlywiki.com/static/Upgrading.html for more details. 
+ClassicWarning/Upgrade/Caption: upgrade
diff --git a/core/ui/ViewTemplate/classic.tid b/core/ui/ViewTemplate/classic.tid
new file mode 100644
index 000000000..036312d2b
--- /dev/null
+++ b/core/ui/ViewTemplate/classic.tid
@@ -0,0 +1,13 @@
+title: $:/core/ui/ViewTemplate/classic
+tags: $:/tags/ViewTemplate $:/tags/EditTemplate
+
+\define lingo-base() $:/language/ClassicWarning/
+<$list filter="[is[current]type[text/x-tiddlywiki]]">
+<div class="tw-message-box">
+
+<<lingo Hint>>
+
+<$button set="!!type" setTo="text/vnd.tiddlywiki"><<lingo Upgrade/Caption>></$button>
+
+</div>
+</$list>
diff --git a/core/wiki/tags/EditTemplate.tid b/core/wiki/tags/EditTemplate.tid
index 3fb395607..9a0c11a89 100644
--- a/core/wiki/tags/EditTemplate.tid
+++ b/core/wiki/tags/EditTemplate.tid
@@ -1,2 +1,2 @@
 title: $:/tags/EditTemplate
-list: [[$:/core/ui/EditTemplate/controls]] [[$:/core/ui/EditTemplate/title]] [[$:/core/ui/EditTemplate/tags]] [[$:/core/ui/EditTemplate/body]] [[$:/core/ui/EditTemplate/type]] [[$:/core/ui/EditTemplate/fields]]
+list: [[$:/core/ui/EditTemplate/controls]] [[$:/core/ui/EditTemplate/title]] [[$:/core/ui/EditTemplate/tags]] [[$:/core/ui/ViewTemplate/classic]] [[$:/core/ui/EditTemplate/body]] [[$:/core/ui/EditTemplate/type]] [[$:/core/ui/EditTemplate/fields]]
diff --git a/core/wiki/tags/ViewTemplate.tid b/core/wiki/tags/ViewTemplate.tid
index 7f711e9f6..b7ccfcefc 100644
--- a/core/wiki/tags/ViewTemplate.tid
+++ b/core/wiki/tags/ViewTemplate.tid
@@ -1,2 +1,2 @@
 title: $:/tags/ViewTemplate
-list: [[$:/core/ui/ViewTemplate/title]] [[$:/core/ui/ViewTemplate/subtitle]] [[$:/core/ui/ViewTemplate/tags]] [[$:/core/ui/ViewTemplate/plugin]] [[$:/core/ui/ViewTemplate/body]] 
+list: [[$:/core/ui/ViewTemplate/title]] [[$:/core/ui/ViewTemplate/subtitle]] [[$:/core/ui/ViewTemplate/tags]] [[$:/core/ui/ViewTemplate/classic]] [[$:/core/ui/ViewTemplate/body]] 
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index 9f245acf8..107369c7d 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -1067,7 +1067,7 @@ canvas.tw-edit-bitmapeditor  {
 	border: 1px solid <<colour message-border>>;
 	background: <<colour message-background>>;
 	padding: 0px 21px 0px 21px;
-	margin: 0 -21px 0 -21px;
+	margin: 21px -21px 21px -21px;
 	font-size: 12px;
 	line-height: 18px;
 	color: <<colour message-foreground>>;