diff --git a/Pipfile b/Pipfile
index 8db9cfe..9853f9c 100644
--- a/Pipfile
+++ b/Pipfile
@@ -27,4 +27,3 @@ inscriptis = "*"
 lxml = "*"
 
 [dev-packages]
-
diff --git a/brutaldon/forms.py b/brutaldon/forms.py
index dfc6bd1..84db4cd 100644
--- a/brutaldon/forms.py
+++ b/brutaldon/forms.py
@@ -38,6 +38,7 @@ class PreferencesForm(forms.ModelForm):
             "click_to_load",
             "lightbox",
             "filter_notifications",
+            "bundle_notifications",
             "poll_frequency",
         ]
 
diff --git a/brutaldon/migrations/0023_preference_bundle_notifications.py b/brutaldon/migrations/0023_preference_bundle_notifications.py
new file mode 100644
index 0000000..303aed5
--- /dev/null
+++ b/brutaldon/migrations/0023_preference_bundle_notifications.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.7 on 2019-11-04 23:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('brutaldon', '0022_auto_20190506_0938'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='preference',
+            name='bundle_notifications',
+            field=models.BooleanField(default=False, help_text='Collapse together boosts or likes of the same toot in the notifications page.'),
+        ),
+    ]
diff --git a/brutaldon/models.py b/brutaldon/models.py
index b63f4fe..4a64cf7 100644
--- a/brutaldon/models.py
+++ b/brutaldon/models.py
@@ -65,6 +65,12 @@ class Preference(models.Model):
         default=False,
         help_text=_("""Exclude boosts and favs from your notifications."""),
     )
+    bundle_notifications = models.BooleanField(
+        default=False,
+        help_text=_(
+            """Collapse together boosts or likes of the same toot in the notifications page."""
+        ),
+    )
 
 
 class Account(models.Model):
diff --git a/brutaldon/templates/comma.html b/brutaldon/templates/comma.html
new file mode 100644
index 0000000..c73893f
--- /dev/null
+++ b/brutaldon/templates/comma.html
@@ -0,0 +1,5 @@
+{% if not forloop.first %}
+    {% if forloop.last %}, and
+    {% else %},
+    {% endif %}
+{% endif %}
diff --git a/brutaldon/templates/main/notifications.html b/brutaldon/templates/main/notifications.html
index d6ab510..14bb9cc 100644
--- a/brutaldon/templates/main/notifications.html
+++ b/brutaldon/templates/main/notifications.html
@@ -3,7 +3,7 @@
 {% load taglinks %}
 
 {% block title %}
-Brutaldon ({{ own_acct.username }}) - Notifications timelime
+    Brutaldon ({{ own_acct.username }}) - Notifications timelime
 {% endblock %}
 
 {% comment %}
@@ -21,73 +21,99 @@ mastodon.notifications()[0]
 
 
 {% block content %}
-<h1 class="title">Your notifications timeline</h1>
-{% for note in notes %}
-{% if note.type == 'mention' %}
-<p>
-    <strong>{{ note.account.display_name }}</strong>
-    (<a href="{{ note.account.url | localuser }}">{{ note.account.acct }}</a>)
-    mentioned you.
-</p>
-<br>
-{% include "main/toot_partial.html" with toot=note.status reblog=False %}
-<hr class="is-hidden">
-{% elif note.type == 'reblog' %}
-<p>
-    {{ note.account.display_name }}
-    (<a href="{{ note.account.url | localuser }}">{{ note.account.acct }}</a>)
-    boosted your toot.
-    (<span>
-    <small>{{ note.created_at |humane_time  }}</small>
-    </span>)
-</p>
-{% include "main/toot_partial.html" with toot=note.status reblog=True reblog_by=note.account.acct reblog_icon=note.account.avatar_static %}
-<hr class="is-hidden">
-{% elif note.type == 'favourite' %}
-<p>
-    {{ note.account.display_name }}
-    (<a href="{{ note.account.url | localuser}}">{{ note.account.acct }}</a>)
-    favorited your toot.
-    (<span>
-    <small>{{ note.created_at |humane_time  }}</small>
-    </span>)
-</p>
-{% include "main/toot_partial.html" with toot=note.status %}
-<hr class="is-hidden">
-{% elif note.type == 'follow' %}
-<article class="media">
-    <figure class="media-left">
-        <p class="image is-64x64">
-            <img src="{{ note.account.avatar_static }}" alt="">
-        </p>
-    </figure>
-    <div class="media-content" >
-        <div class="content">
-            <strong>{{ note.account.display_name }}</strong>
-            (<a href="{{ note.account.url |localuser }}">{{ note.account.acct }}</a>)
-            followed you.
-            (<a href="{{ note.url }}">
-                <small>{{ note.created_at |humane_time  }}</small>
-            </a>)
-        </div>
-    </div>
-</article>
-<hr class="is-hidden">
-{% elif note.type == 'poll' %}
-     <p>A poll you created or voted in has ended.</p>
-     {% include "main/toot_partial.html" with toot=note.status %}
-<hr class="is-hidden">
-{% endif %}
-{% endfor %}
+    <h1 class="title">Your notifications timeline</h1>
+    {% for group in groups %}
+        {% if bundle_notifications and group.0.type in bundleable  %}
+            {% if group.0.type == 'favourite' %}
+                <p>
+                    {% for account in group.accounts %}
+                        {% include "comma.html" %}{{ account.display_name }}
+                        (<a href="{{ account.url | localuser}}">{{ account.acct }}</a>)
+                    {% endfor %}
+                    favorited your toot.
+                </p>
+                {% include "main/toot_partial.html" with toot=group.0.status %}
+                <hr class="is-hidden">
+            {% elif group.0.type == 'reblog' %}
+                <p>
+                    {% for account in group.accounts %}
+                        {% include "comma.html" %}{{ account.display_name }}
+                        (<a href="{{ account.url | localuser }}">{{ account.acct }}</a>)
+                    {% endfor %}
+                    boosted your toot.
+                </p>
+                {% include "main/toot_partial.html" with toot=group.0.status reblog=True reblog_by=group.0.account.acct reblog_icon=group.0.account.avatar_static %}
+                <hr class="is-hidden">
+            {% endif %}
+        {% else %}
+            {% for note in group %}
+                {% if note.type == 'mention' %}
+                    <p>
+                        <strong>{{ note.account.display_name }}</strong>
+                        (<a href="{{ note.account.url | localuser }}">{{ note.account.acct }}</a>)
+                        mentioned you.
+                    </p>
+                    <br>
+                    {% include "main/toot_partial.html" with toot=note.status reblog=False %}
+                    <hr class="is-hidden">
+                {% elif note.type == 'reblog' %}
+                    <p>
+                        {{ note.account.display_name }}
+                        (<a href="{{ note.account.url | localuser }}">{{ note.account.acct }}</a>)
+                        boosted your toot.
+                        (<span>
+                        <small>{{ note.created_at |humane_time  }}</small>
+                        </span>)
+                    </p>
+                    {% include "main/toot_partial.html" with toot=note.status reblog=True reblog_by=note.account.acct reblog_icon=note.account.avatar_static %}
+                    <hr class="is-hidden">
+                {% elif note.type == 'favourite' %}
+                    <p>
+                        {{ note.account.display_name }}
+                        (<a href="{{ note.account.url | localuser}}">{{ note.account.acct }}</a>)
+                        favorited your toot.
+                        (<span>
+                        <small>{{ note.created_at |humane_time  }}</small>
+                        </span>)
+                    </p>
+                    {% include "main/toot_partial.html" with toot=note.status %}
+                    <hr class="is-hidden">
+                {% elif note.type == 'follow' %}
+                    <article class="media">
+                        <figure class="media-left">
+                            <p class="image is-64x64">
+                                <img src="{{ note.account.avatar_static }}" alt="">
+                            </p>
+                        </figure>
+                        <div class="media-content" >
+                            <div class="content">
+                                <strong>{{ note.account.display_name }}</strong>
+                                (<a href="{{ note.account.url |localuser }}">{{ note.account.acct }}</a>)
+                                followed you.
+                                (<a href="{{ note.url }}">
+                                    <small>{{ note.created_at |humane_time  }}</small>
+                                </a>)
+                            </div>
+                        </div>
+                    </article>
+                    <hr class="is-hidden">
+                {% elif note.type == 'poll' %}
+                    <p>A poll you created or voted in has ended.</p>
+                    {% include "main/toot_partial.html" with toot=note.status %}
+                    <hr class="is-hidden">
+                {% endif %}
+            {% endfor %}
+        {% endif %}
+    {% endfor %}
 
-<nav class="pagination is-centered" role="navigation" aria-label="pagination">
-    {% if prev %}
-    <a class="pagination-next" href="{% url 'note_prev' prev.min_id %}">Newer</a>
-    {% endif %}
-    {% if next %}
-    <a class="pagination-previous" href="{% url 'note_next' next.max_id %}">Older</a>
-    {% endif %}
-</nav>
+    <nav class="pagination is-centered" role="navigation" aria-label="pagination">
+        {% if prev %}
+            <a class="pagination-next" href="{% url 'note_prev' prev.min_id %}">Newer</a>
+        {% endif %}
+        {% if next %}
+            <a class="pagination-previous" href="{% url 'note_next' next.max_id %}">Older</a>
+        {% endif %}
+    </nav>
 
 
 {% endblock %}
diff --git a/brutaldon/templates/setup/settings.html b/brutaldon/templates/setup/settings.html
index a8f9e22..2e09f20 100644
--- a/brutaldon/templates/setup/settings.html
+++ b/brutaldon/templates/setup/settings.html
@@ -125,6 +125,23 @@
 
                 </div>
             </div>
+            <div class="columns">
+                <div class="column is-quarter">
+                    <label class="label checkbox" for="id_bundle_notifications">
+                        {% render_field form.bundle_notifications class+="checkbox" %}
+                        {{ form.bundle_notifications.label }}
+                    </label>
+                </div>
+                <div class="column is-quarter">
+                    <p class="notification is-info preferences-help">
+                        {{ form.bundle_notifications.help_text }}
+                    </p>
+                </div>
+                <div class="column is-half">
+
+                </div>
+            </div>
+
             <div class="columns">
                 <div class="column is-quarter">
                     <label class="label" for="id_poll_frequency">
diff --git a/brutaldon/views.py b/brutaldon/views.py
index eb6d034..389027e 100644
--- a/brutaldon/views.py
+++ b/brutaldon/views.py
@@ -24,6 +24,7 @@ from mastodon import (
 )
 from urllib import parse
 from pdb import set_trace
+from itertools import groupby
 from inscriptis import get_text
 from time import sleep
 from requests import Session
@@ -32,7 +33,19 @@ import re
 
 class NotLoggedInException(Exception):
     pass
-
+class LabeledList(list):
+    """A subclass of list that can accept additional attributes"""
+    def __new__(self, *args, **kwargs):
+        return super(LabeledList, self).__new__(self, args, kwargs)
+    def __init(self, *args, **kwargs):
+        if len(args) == 1 and hasattr(args[0], '__iter__'):
+            list.__init__(self, args[0])
+        else:
+            list.__init__(self, args)
+        self.__dict__.update(kwargs)
+    def __call(self, **kwargs):
+        self.__dict__.update(kwargs)
+        return self
 
 global sessons_cache
 sessions_cache = {}
@@ -612,17 +625,34 @@ def note(request, next=None, prev=None):
         next = notes[-1]._pagination_next
     except (IndexError, AttributeError, KeyError):
         next = None
+
+    # Now group notes into lists based on type and status
+    groups = []
+    if account.preferences.bundle_notifications:
+        def bundle_key(note):
+            return str(note.status.id) + note.type
+        sorted_notes = sorted(notes, key=bundle_key, reverse=True)
+        for _, group in groupby(sorted_notes, bundle_key):
+            group = LabeledList(group)
+            group.accounts = [x.account for x in group]
+            groups.append(group)
+    else:
+        groups.append(notes)
+
     return render(
         request,
         "main/notifications.html",
         {
             "notes": notes,
+            "groups": groups,
             "timeline": "Notifications",
             "timeline_name": "Notifications",
             "own_acct": request.session["active_user"],
             "preferences": account.preferences,
             "prev": prev,
             "next": next,
+            "bundleable": ["favourite", "reblog"],
+            "bundle_notifications": account.preferences.bundle_notifications,
         },
     )
 
@@ -735,6 +765,9 @@ def settings(request):
             account.preferences.filter_notifications = form.cleaned_data[
                 "filter_notifications"
             ]
+            account.preferences.bundle_notifications = form.cleaned_data[
+                "bundle_notifications"
+            ]
             account.preferences.poll_frequency = form.cleaned_data["poll_frequency"]
             request.session["timezone"] = account.preferences.timezone
             account.preferences.save()