diff --git a/lib/chiya/notes/note.ex b/lib/chiya/notes/note.ex
index 8392f95..f1f0df5 100644
--- a/lib/chiya/notes/note.ex
+++ b/lib/chiya/notes/note.ex
@@ -66,6 +66,10 @@ defmodule Chiya.Notes.Note do
     end
   end
 
+  def note_title(note_content) do
+    String.slice(note_content, 0..25)
+  end
+
   @doc false
   def changeset(note, attrs) do
     # if you need to have a preloaded note here,
diff --git a/lib/chiya_web/indie/micropub_handler.ex b/lib/chiya_web/indie/micropub_handler.ex
index d094fe7..75f0b6c 100644
--- a/lib/chiya_web/indie/micropub_handler.ex
+++ b/lib/chiya_web/indie/micropub_handler.ex
@@ -173,7 +173,7 @@ defmodule ChiyaWeb.Indie.MicropubHandler do
 
   defp get_note_attrs(p, default_channel) do
     content = Props.get_content(p)
-    name = Props.get_title(p) || String.slice(content, 0..15)
+    name = Props.get_title(p) || Chiya.Notes.Note.note_title(content)
     tags = Props.get_tags(p) |> Enum.join(",")
 
     published_at =