diff --git a/app/main/views/templates.py b/app/main/views/templates.py
index 39f0e9dbe..67973ad13 100644
--- a/app/main/views/templates.py
+++ b/app/main/views/templates.py
@@ -12,9 +12,9 @@ from notifications_utils.recipients import first_column_headings
 from app import (
     current_service,
     service_api_client,
+    template_folder_api_client,
     template_statistics_client,
     user_api_client,
-    template_folder_api_client
 )
 from app.main import main
 from app.main.forms import (
@@ -24,7 +24,7 @@ from app.main.forms import (
     SearchTemplatesForm,
     SetTemplateSenderForm,
     SMSTemplateForm,
-    TemplateFolderForm
+    TemplateFolderForm,
 )
 from app.main.views.send import get_example_csv_rows, get_sender_details
 from app.models.service import Service
@@ -117,6 +117,7 @@ def choose_template(service_id, template_type='all'):
 
     return render_template(
         'views/templates/choose.html',
+        template_folders=current_service.template_folders,
         templates=current_service.templates_by_type(template_type),
         show_search_box=(len(current_service.templates_by_type(template_type)) > 7),
         show_template_nav=(
diff --git a/app/models/service.py b/app/models/service.py
index 9b5c534e4..18c53aae9 100644
--- a/app/models/service.py
+++ b/app/models/service.py
@@ -7,8 +7,10 @@ from app.notify_client.inbound_number_client import inbound_number_client
 from app.notify_client.job_api_client import job_api_client
 from app.notify_client.organisations_api_client import organisations_client
 from app.notify_client.service_api_client import service_api_client
+from app.notify_client.template_folder_api_client import (
+    template_folder_api_client,
+)
 from app.notify_client.user_api_client import user_api_client
-from app.notify_client.template_folder_api_client import template_folder_api_client
 from app.utils import get_default_sms_sender
 
 
diff --git a/app/notify_client/template_folder_api_client.py b/app/notify_client/template_folder_api_client.py
index 680838a55..c04a7bada 100644
--- a/app/notify_client/template_folder_api_client.py
+++ b/app/notify_client/template_folder_api_client.py
@@ -22,7 +22,7 @@ class TemplateFolderAPIClient(NotifyAdminAPIClient):
 
     @cache.set('service-{service_id}-template-folders')
     def get_template_folders(self, service_id):
-        return self.get('/service/{}/template-folder'.format(service_id))['data']
+        return self.get('/service/{}/template-folder'.format(service_id))['template_folders']
 
 
 template_folder_api_client = TemplateFolderAPIClient()
diff --git a/app/templates/views/templates/choose.html b/app/templates/views/templates/choose.html
index e69ac226a..85b586666 100644
--- a/app/templates/views/templates/choose.html
+++ b/app/templates/views/templates/choose.html
@@ -59,6 +59,16 @@
     {{ live_search(target_selector='#template-list .column-whole', show=show_search_box, form=search_form) }}
 
     <nav class="grid-row" id=template-list>
+      {% for template_folder in template_folders %}
+        <div class="column-whole">
+          <h2 class="message-name">
+            {# <a href="{{ url_for('.view_template_folder', service_id=current_service.id, template_folder_id=template_folder.id) }}"> #}
+              {{ template_folder.name }}
+            {# </a> #}
+          </h2>
+          <p class="message-type">Folder containing {{ template_count }} template{% if template_count != 1 %}s{% endif %}</p>
+        </div>
+      {% endfor %}
       {% for template in templates %}
         <div class="column-whole">
           <h2 class="message-name">
diff --git a/tests/app/main/views/test_accept_invite.py b/tests/app/main/views/test_accept_invite.py
index 6f22eabdb..3e9118248 100644
--- a/tests/app/main/views/test_accept_invite.py
+++ b/tests/app/main/views/test_accept_invite.py
@@ -139,6 +139,7 @@ def test_accepting_invite_removes_invite_from_session(
     mock_get_template_statistics,
     mock_get_jobs,
     mock_get_service_statistics,
+    mock_get_template_folders,
     mock_get_usage,
     mock_get_inbound_sms_summary,
     fake_uuid,
diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py
index 7a6e2f502..be9fef204 100644
--- a/tests/app/main/views/test_send.py
+++ b/tests/app/main/views/test_send.py
@@ -2186,7 +2186,6 @@ def test_dont_show_preview_letter_templates_for_bad_filetype(
 
 
 @pytest.mark.parametrize('route, response_code', [
-    ('main.choose_template', 200),
     ('main.send_messages', 200),
     ('main.get_example_csv', 200),
     ('main.send_test', 302)
@@ -2259,7 +2258,6 @@ def test_route_permissions_send_check_notifications(
 
 
 @pytest.mark.parametrize('route, expected_status', [
-    ('main.choose_template', 200),
     ('main.send_messages', 403),
     ('main.get_example_csv', 403),
     ('main.send_test', 403),
diff --git a/tests/app/main/views/test_templates.py b/tests/app/main/views/test_templates.py
index 6aaebb32b..33bcb3cac 100644
--- a/tests/app/main/views/test_templates.py
+++ b/tests/app/main/views/test_templates.py
@@ -96,6 +96,7 @@ from tests.conftest import single_letter_contact_block
 def test_should_show_page_for_choosing_a_template(
     client_request,
     mock_get_service_templates,
+    mock_get_template_folders,
     mock_has_no_jobs,
     extra_args,
     expected_nav_links,
@@ -136,6 +137,7 @@ def test_should_show_page_for_choosing_a_template(
 
 def test_should_not_show_template_nav_if_only_one_type_of_template(
     client_request,
+    mock_get_template_folders,
     mock_get_service_templates_with_only_one_template,
 ):
 
@@ -149,6 +151,7 @@ def test_should_not_show_template_nav_if_only_one_type_of_template(
 
 def test_should_not_show_live_search_if_list_of_templates_fits_onscreen(
     client_request,
+    mock_get_template_folders,
     mock_get_service_templates
 ):
 
@@ -162,6 +165,7 @@ def test_should_not_show_live_search_if_list_of_templates_fits_onscreen(
 
 def test_should_show_live_search_if_list_of_templates_taller_than_screen(
     client_request,
+    mock_get_template_folders,
     mock_get_more_service_templates_than_can_fit_onscreen
 ):
 
@@ -1213,6 +1217,7 @@ def test_route_permissions_for_choose_template(
     app_,
     client,
     api_user_active,
+    mock_get_template_folders,
     service_one,
     mock_get_service_templates,
 ):
diff --git a/tests/app/notify_client/test_template_folder_client.py b/tests/app/notify_client/test_template_folder_client.py
index e2e0cad27..58b7cd60e 100644
--- a/tests/app/notify_client/test_template_folder_client.py
+++ b/tests/app/notify_client/test_template_folder_client.py
@@ -1,6 +1,7 @@
-import pytest
 import uuid
 
+import pytest
+
 from app.notify_client.template_folder_api_client import TemplateFolderAPIClient
 
 
@@ -24,8 +25,11 @@ def test_create_template_folder_calls_correct_api_endpoint(mocker, api_user_acti
 
 def test_get_template_folders_calls_correct_api_endpoint(mocker, api_user_active):
     mock_redis_get = mocker.patch('app.notify_client.RedisClient.get', return_value=None)
-    mock_api_get = mocker.patch('app.notify_client.NotifyAdminAPIClient.get', return_value={'data': {'a': 'b'}})
     mock_redis_set = mocker.patch('app.notify_client.RedisClient.set')
+    mock_api_get = mocker.patch(
+        'app.notify_client.NotifyAdminAPIClient.get',
+        return_value={'template_folders': {'a': 'b'}}
+    )
 
     some_service_id = uuid.uuid4()
     expected_url = '/service/{}/template-folder'.format(some_service_id)
diff --git a/tests/app/test_navigation.py b/tests/app/test_navigation.py
index 2187f4f2c..fb2cd82cd 100644
--- a/tests/app/test_navigation.py
+++ b/tests/app/test_navigation.py
@@ -104,6 +104,7 @@ def test_a_page_should_nave_selected_navigation_item(
     mock_get_service_templates,
     mock_get_users_by_service,
     mock_get_invites_for_service,
+    mock_get_template_folders,
     endpoint,
     selected_nav_item,
 ):
@@ -151,6 +152,7 @@ def test_caseworkers_get_caseworking_navigation(
     client_request,
     mocker,
     fake_uuid,
+    mock_get_template_folders,
     mock_get_service_templates,
     mock_has_no_jobs,
 ):
@@ -169,6 +171,7 @@ def test_caseworkers_see_jobs_nav_if_jobs_exist(
     mocker,
     fake_uuid,
     mock_get_service_templates,
+    mock_get_template_folders,
     mock_has_jobs,
 ):
     mocker.patch(
diff --git a/tests/conftest.py b/tests/conftest.py
index 0b7c18c3f..288d91812 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,3 +1,4 @@
+import uuid
 import json
 import os
 from contextlib import contextmanager
@@ -3236,3 +3237,10 @@ def mock_create_event(mocker):
 def url_for_endpoint_with_token(endpoint, token):
     token = token.replace('%2E', '.')
     return url_for(endpoint, token=token)
+
+
+@pytest.fixture
+def mock_get_template_folders(mocker):
+    return mocker.patch('app.template_folder_api_client.get_template_folders', return_value=[
+        {'id': uuid.uuid4(), 'name': 'Template Folder', 'parent_id': None}
+    ])