diff --git a/public/compose.html b/public/compose.html
index e35b0fd..2a52675 100644
--- a/public/compose.html
+++ b/public/compose.html
@@ -1,4 +1,4 @@
-{{template "head"}}
+{{template "head.html"}}
 
 <h1>koushin</h1>
 
@@ -23,4 +23,4 @@
 	<input type="submit" value="Send">
 </form>
 
-{{template "foot"}}
+{{template "foot.html"}}
diff --git a/public/foot.html b/public/foot.html
index d92a512..b605728 100644
--- a/public/foot.html
+++ b/public/foot.html
@@ -1,4 +1,2 @@
-{{define "foot"}}
   </body>
 </html>
-{{end}}
diff --git a/public/head.html b/public/head.html
index c8c6b42..35dda42 100644
--- a/public/head.html
+++ b/public/head.html
@@ -1,4 +1,3 @@
-{{define "head"}}
 <!DOCTYPE html>
 <html lang="en">
   <head>
@@ -7,4 +6,3 @@
     <link rel="stylesheet" href="/assets/style.css">
   </head>
   <body>
-{{end}}
diff --git a/public/login.html b/public/login.html
index 54cb341..f193c21 100644
--- a/public/login.html
+++ b/public/login.html
@@ -1,4 +1,4 @@
-{{template "head"}}
+{{template "head.html"}}
 
 <h1>koushin</h1>
 
@@ -11,4 +11,4 @@
 	<input type="submit" value="Login">
 </form>
 
-{{template "foot"}}
+{{template "foot.html"}}
diff --git a/public/mailbox.html b/public/mailbox.html
index 722aae0..ddd1260 100644
--- a/public/mailbox.html
+++ b/public/mailbox.html
@@ -1,4 +1,4 @@
-{{template "head"}}
+{{template "head.html"}}
 
 <h1>koushin</h1>
 
@@ -42,4 +42,4 @@
 	<p>Mailbox is empty.</p>
 {{end}}
 
-{{template "foot"}}
+{{template "foot.html"}}
diff --git a/public/message.html b/public/message.html
index f653057..729937d 100644
--- a/public/message.html
+++ b/public/message.html
@@ -1,4 +1,4 @@
-{{template "head"}}
+{{template "head.html"}}
 
 <h1>koushin</h1>
 
@@ -55,4 +55,4 @@
 	<a href="{{.Message.Uid}}/raw?part={{.PartPath}}">Download</a>
 {{end}}
 
-{{template "foot"}}
+{{template "foot.html"}}
