3 files changed, 8 insertions, 7 deletions
diff --git a/cmd/ponzu/contentType.tmpl b/cmd/ponzu/contentType.tmpl
index df582a0..af60e57 100644
--- a/cmd/ponzu/contentType.tmpl
+++ b/cmd/ponzu/contentType.tmpl
@@ -41,10 +41,6 @@ func init() {
 	Types["{{ .Name }}"] = func() interface{} { return new({{ .Name }}) }
 }
 
-// ContentName is required to set the display name for a piece of content in the editor
-// Partially implements editor.Editable
-func ({{ .Initial }} *{{ .Name }}) ContentName() string { return fmt.Sprintf("{{ .Name }} - ID: %s", {{ .Initial }}.UniqueID()) }
-
 // Editor is a buffer of bytes for the Form function to write input views
 // partially implements editor.Editable
 func ({{ .Initial }} *{{ .Name }}) Editor() *editor.Editor { return &{{ .Initial }}.editor }
diff --git a/cmd/ponzu/vendor/github.com/nilslice/email/README.md b/cmd/ponzu/vendor/github.com/nilslice/email/README.md
index 323004c..190c61f 100644
--- a/cmd/ponzu/vendor/github.com/nilslice/email/README.md
+++ b/cmd/ponzu/vendor/github.com/nilslice/email/README.md
@@ -19,7 +19,7 @@ import (
 func main() {
     msg := email.Message{
         To: "you@server.name", // do not add < > or name in quotes
-        From: "Name <me@server.name>", // ok to format in From field
+        From: "me@server.name", // do not add < > or name in quotes
         Subject: "A simple email",
         Body: "Plain text email body. HTML not yet supported, but send a PR!",
     }
diff --git a/cmd/ponzu/vendor/github.com/nilslice/email/email.go b/cmd/ponzu/vendor/github.com/nilslice/email/email.go
index 9d613c8..15f0a49 100644
--- a/cmd/ponzu/vendor/github.com/nilslice/email/email.go
+++ b/cmd/ponzu/vendor/github.com/nilslice/email/email.go
@@ -87,14 +87,14 @@ func send(m Message, c *smtp.Client) error {
 	}
 
 	if m.From != "" {
-		_, err = msg.Write([]byte("From: " + m.From + "\r\n"))
+		_, err = msg.Write([]byte("From: <" + m.From + ">\r\n"))
 		if err != nil {
 			return err
 		}
 	}
 
 	if m.To != "" {
-		_, err = msg.Write([]byte("To: " + m.To + "\r\n"))
+		_, err = msg.Write([]byte("To: <" + m.To + ">\r\n"))
 		if err != nil {
 			return err
 		}
@@ -110,5 +110,10 @@ func send(m Message, c *smtp.Client) error {
 		return err
 	}
 
+	err = c.Quit()
+	if err != nil {
+		return err
+	}
+
 	return nil
 }