diff --git a/help/C/accounts.page b/help/C/accounts.page
index ea599d67..8839d9a0 100644
--- a/help/C/accounts.page
+++ b/help/C/accounts.page
@@ -9,7 +9,7 @@
     </info>
 	<title>Accounts</title>
 	
-	<section>
+	<section id="adding-accounts">
 	<title>Adding accounts</title>
 	
 	<p>The first time you start Geary, you will be prompted to add an email account.  On this screen,
@@ -24,7 +24,7 @@
 	dialog.  To add an account, click the + button.</p>
 	</section>
 	
-	<section>
+	<section id="editing-accounts">
 	<title>Editing existing accounts</title>
 	
 	<p>From the Accounts dialog, select an account and click the pencil icon to change various settings.
@@ -59,7 +59,7 @@
 	
 	</section>
 	
-	<section>
+	<section id="removing-accounts">
 	<title>Removing accounts</title>
 	
 	<p>To delete an account, open the Accounts dialog, select the account, and press the - button.
diff --git a/help/C/label.page b/help/C/label.page
index a36ec841..37f66340 100644
--- a/help/C/label.page
+++ b/help/C/label.page
@@ -8,7 +8,7 @@
         <link type="next" xref="preferences"/>
     </info>
 	<title>Label or move a conversation</title>
-	<section>
+	<section id="label-conversation">
 	<title>Label a conversation</title>
 	<p>Geary lets you apply one or more <em>labels</em> to each conversation.  Geary labels
 	correspond to labels in Gmail, or ordinary folders in other mail services.</p>
@@ -21,7 +21,7 @@
 	conversation list to the label in the sidebar.</p></item>
 	</list>
 	</section>
-	<section>
+	<section id="move-conversation">
 	<title>Move a conversation to a folder or label</title>
 	<p>To move one or more conversations to a folder or label, first select the
 	conversation(s), then do either of the following:</p>
diff --git a/help/C/overview.page b/help/C/overview.page
index 5716403a..3ff86395 100644
--- a/help/C/overview.page
+++ b/help/C/overview.page
@@ -16,7 +16,7 @@ support the IMAP protocol, including popular services such as Gmail, Yahoo Mail,
 
     <p>The main Geary window is divided into several areas:</p>
     
-    <section>
+    <section id="folder-list">
     <title>Folder list</title>
     <p>The <em>folder list</em> at the left displays all <em>folders</em> and
     <em>labels</em> in your mail account.  Geary uses the term <em>label</em> for any folder
@@ -24,7 +24,7 @@ support the IMAP protocol, including popular services such as Gmail, Yahoo Mail,
     also uses this term; most other mail services do not.)</p>
     </section>
     
-    <section>
+    <section id="conversation-list">
     <title>Conversation list</title>
     <p>The <em>conversation list</em> displays a list of conversations in the
     selected folder.  Newer conversations appear at the top.</p>
@@ -40,7 +40,7 @@ support the IMAP protocol, including popular services such as Gmail, Yahoo Mail,
     conversation in a range, then hold down <key>Shift</key> and click the last conversation.</p>
     </section>
     
-    <section>
+    <section id="message-area">
     <title>Message area</title>
     <p>The <em>message area</em> displays all messages in the selected conversation,
     with the oldest message at the top.</p>
diff --git a/help/C/preferences.page b/help/C/preferences.page
index 7701e3ba..1dd36aff 100644
--- a/help/C/preferences.page
+++ b/help/C/preferences.page
@@ -13,7 +13,7 @@
 	shell.  For GNOME Shell and Unity, the application menu is available near the top-left corner of
 	the screen.)</p>
 	
-    <section>
+    <section id="reading">
 	<title>Reading</title>
 	<terms>
 	<item>
@@ -36,7 +36,7 @@
 	</terms>
 	</section>
 	
-	<section>
+	<section id="composer">
 	<title>Composer</title>
 	<terms>
 	<item>
@@ -47,7 +47,7 @@
 	</terms>
 	</section>
 	
-	<section>
+	<section id="notifications">
 	<title>Notifications</title>
 	<terms>
 	<item>
diff --git a/help/C/search.page b/help/C/search.page
index 218116ed..b2d0d000 100644
--- a/help/C/search.page
+++ b/help/C/search.page
@@ -19,7 +19,7 @@
 	<p>Keywords that match your search are highlighted in the message view.  Geary will match different
 	forms of the same word, for example searching for "walk" will also match "walking" and "walked."</p>
 	
-	<section>
+	<section id="search-operators">
 	<title>Search operators</title>
 	<p>Geary supports the following operators to limit the scope of searches:</p>
 	<table frame="all" rules="rows">
diff --git a/help/C/star.page b/help/C/star.page
index 2cb055dc..618ffff7 100644
--- a/help/C/star.page
+++ b/help/C/star.page
@@ -8,13 +8,13 @@
         <link type="next" xref="write"/>
     </info>
 	<title>Star a message or mark it as read/unread</title>
-	<section>
+	<section id="star-messages">
 	<title>Star messages</title>
 	<p>You can star messages to indicate that they're important to you.
 	To mark a conversation with a star, click its star icon in the conversation list. You can star an individual message by clicking the star at the upper right of the message itself.</p>
 	<p>With Gmail accounts, starred messages appear in the Starred folder in the folder list.</p>
 	</section>
-	<section>
+	<section id="mark-read-unread">
 	<title>Mark messages as read or unread</title>
 	<p>Geary marks messages as read automatically as you read them.
 	To manually toggle a conversation as read or unread, click the circle icon in the conversation list.</p>
diff --git a/help/C/write.page b/help/C/write.page
index 5adb5919..752e0443 100644
--- a/help/C/write.page
+++ b/help/C/write.page
@@ -8,7 +8,8 @@
     </info>
 	<title>Write a message</title>
 	
-	<section>
+	<section id="overview">
+	<title>Composing and replying</title>
 	<p>To compose a new message in Geary, press the <gui>New Message</gui> button
 	on the toolbar.</p>
 	
@@ -16,7 +17,7 @@
 	
 	</section>
 	
-	<section>
+	<section id="features">
 	<title>Features</title>
 	
 	<p>Geary's email composer lets you adjust the font, size and color of text. You can also insert hyperlinks into messages.</p>
@@ -38,7 +39,7 @@
 	dialog.</p>
 	
 	</section>
-	<section>
+	<section id="drafts">
 	<title>Drafts</title>
 	
 	<p>For mail servers that support drafts, Geary will automatically save the message as you type.