feat(queries): make Sent a saved query rather than a fixed button

The user asked whether the default queries could be unified with Sent. The
answer runs the other way: Sent joins the saved queries rather than the saved
queries becoming hardcoded.

Inbox, Unread and Important are complete strings that depend on nothing and can
never go stale, so generating them would buy nothing and would cost the four
things the file just gained: reordering, unpinning, renaming and deleting.
Hardcoding them would also make them undeletable, which is a regression for
anyone who does not want one of them.

Sent is different only in that its query CANNOT be stored: it is composed from
every account's `sent` key, so a stored copy goes stale the moment a folder is
renamed. That is a property of Sent, not of "default queries". Storing the
GENERATOR rather than its output keeps both halves: `"generated": "sent"` still
resolves from the accounts at click time, and the entry is an ordinary row that
can be reordered, renamed, unpinned or removed. The row now follows one rule
instead of carrying one member the user did not own.

Two properties had to travel with the entry. The composed query, resolved
through Config::resolvedQuery() so what lands in the bar is what actually ran;
and FLAT mode, since a sent view lists messages and a threaded one folds every
reply back into the conversation the user sent one message into. The sent
generator implies flat rather than trusting the file to say so, because a
hand-edited row would otherwise produce a threaded sent view.

An unknown generator is reported but the row is KEPT: a later build may know it,
and dropping it here would delete it from the file on the next save, which is
the same data loss the unknown-field handling exists to prevent. A generator
whose accounts configure nothing is skipped entirely, exactly as the hardcoded
button was hidden rather than offering one that finds nothing.

Eight new tests. The four pre-existing Sent tests reach this through migration
and were left alone, which is what proves the migrated path still behaves; the
new ones cover a STORED file, which is the path every launch after the first
takes. Mutations: a generator resolving to nothing fails three, ignoring flat
fails two, and not skipping an empty generator fails one. A rename test guards
the property the change exists for, since anything keyed on the literal name
"Sent" would break it.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

7 files changed, 413 insertions, 31 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 428e3e5..b384eda 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,11 @@ point at which they are stable.
   **order**, a `pinned` flag and an optional account scope. The order in the
   file is the order the buttons appear in, so rearranging them is a matter of
   moving lines.
+- **Sent is a saved query now**, carrying `"generated": "sent"` instead of a
+  stored query. It is still composed from your accounts' `sent` keys every time
+  you click it, so correcting a folder name still updates it with no edit, but
+  it can now be reordered, renamed, unpinned or deleted like any other entry
+  rather than being a fixed button you did not own.
 
 ### Changed
 
@@ -30,13 +35,18 @@ point at which they are stable.
   query field is no longer squeezed by a long list of buttons.
 - Saved-query buttons follow the file's order instead of appearing
   alphabetically.
+- The Sent button is no longer hardcoded beside the saved queries, so the whole
+  row now follows one rule instead of having one member that behaved
+  differently from its neighbours.
 
 ### Upgrading
 
 Saved queries move out of the `[queries]` section of `qtmaildir.conf` and into
 `~/.config/qtmaildir/queries.json`. **The first launch migrates them for you**:
 the section is read, the JSON file is written from it, and every entry is
-marked pinned so your buttons stay where they were.
+marked pinned so your buttons stay where they were. Sent is appended as a
+`generated` entry, where its button already sat, provided an account configures
+a sent folder.
 
 Your config file is left byte-for-byte alone. The old `[queries]` section stays
 in it, ignored from then on, and can be deleted by hand whenever you like. It is
diff --git a/README.md b/README.md
index 81ec7d8..749d89d 100644
--- a/README.md
+++ b/README.md
@@ -223,16 +223,36 @@ queries** menu, which keeps the row usable once you have more than a handful.
 same as choosing that account in the dropdown; leave it out for a query that
 spans every account.
 
+**Sent is an entry like any other**, and the one that carries `generated`
+instead of `query`:
+
+```json
+{ "name": "Sent", "generated": "sent", "pinned": true }
+```
+
+A generated query is composed from your accounts every time you click it,
+rather than stored. That is why Sent has no `query` of its own: it is built
+from every account's `sent` key, so adding an account or correcting a folder
+name updates the button with no edit here. A stored copy of the same string
+would quietly go on naming the old folder.
+
+Being an ordinary entry, it can be reordered, renamed, unpinned or deleted like
+the rest. Renaming it to `Posta inviata` changes only the label. `sent` is the
+only generator today, and it is skipped entirely when no account configures a
+sent folder, rather than offering a button that finds nothing.
+
 The name is what the button says, so `Important` and `Flagged` can run the same
 query and differ only in the label.
 
 **Upgrading from 0.17.0 or earlier.** Saved queries used to live in a
 `[queries]` section of `qtmaildir.conf`. The first launch after upgrading reads
 that section, writes `queries.json` from it, and marks every entry pinned so
-your buttons stay where they were. Your config file is not modified: the old
-`[queries]` section is left exactly as it is, ignored from then on, and you can
-delete it by hand whenever you like. The reason it is not removed for you is
-that rewriting the file would drop your comments and reorder your keys.
+your buttons stay where they were. Sent is added as a `generated` entry at the
+end, where its button already sat, provided an account configures a sent
+folder. Your config file is not modified: the old `[queries]` section is left
+exactly as it is, ignored from then on, and you can delete it by hand whenever
+you like. The reason it is not removed for you is that rewriting the file would
+drop your comments and reorder your keys.
 
 One behaviour changes with the move. Buttons used to appear in alphabetical
 order, because the INI backend returns keys sorted and preserving file order
diff --git a/src/config.cpp b/src/config.cpp
index 8cd5e56..9edba50 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -51,6 +51,14 @@ constexpr int kMaxToolbarIconSize = 64;
 /// two-repo change and no hook stops tagging if it is half-deployed.
 constexpr int kQueriesFormatVersion = 1;
 
+/// Generators a saved query may name in its `generated` field.
+///
+/// A closed set, checked on load so a typo is reported rather than producing a
+/// button that silently finds nothing. Adding one here needs no format bump:
+/// an older build keeps the row and reports it, which is why an unknown
+/// generator is a problem rather than a reason to drop the entry.
+const QStringList kQueryGenerators = { QStringLiteral("sent") };
+
 } // namespace
 
 QString Account::scopedQuery(const QString &query) const
@@ -457,9 +465,26 @@ void Config::loadSavedQueries(const QString &configPath, QSettings &settings)
         }
         settings.endGroup();
 
+        // Sent was a hardcoded button beside the saved queries and becomes an
+        // ordinary row here, so it can be reordered, renamed, unpinned or
+        // removed like any other. It stays GENERATED, so it still follows the
+        // accounts. Appended last, where the button already sat.
+        //
+        // Only when an account actually configures a sent folder: the button
+        // was hidden entirely otherwise, and migrating a row that always finds
+        // nothing would be worse than what it replaces.
+        if (!allSentQuery().isEmpty()) {
+            SavedQuery sent;
+            sent.name = QStringLiteral("Sent");
+            sent.generated = QStringLiteral("sent");
+            sent.pinned = true;
+            sent.flat = true;
+            m_savedQueries.append(sent);
+        }
+
         // Order is alphabetical here because childKeys() is genuinely all the
         // INI knows. The user reorders once and it sticks from then on.
-        if (!names.isEmpty() && !saveSavedQueries()) {
+        if (!m_savedQueries.isEmpty() && !saveSavedQueries()) {
             addProblem(QStringLiteral("Could not write saved queries to %1.")
                            .arg(m_queriesPath));
         }
@@ -516,6 +541,26 @@ void Config::loadSavedQueries(const QString &configPath, QSettings &settings)
         query.query = object.value(QStringLiteral("query")).toString();
         query.pinned = object.value(QStringLiteral("pinned")).toBool(false);
         query.account = object.value(QStringLiteral("account")).toString();
+        query.generated = object.value(QStringLiteral("generated")).toString();
+        // A generator carries its own view mode, so "sent" is flat whether or
+        // not the file says so. Storing it as a plain field would let a
+        // hand-edited or migrated-from-elsewhere row produce a THREADED sent
+        // view, which folds every reply back into the conversation the user
+        // sent one message into. The file may still set it for an ordinary
+        // query.
+        query.flat = object.value(QStringLiteral("flat")).toBool(false)
+                     || query.generated == QStringLiteral("sent");
+
+        if (query.isGenerated()
+            && !kQueryGenerators.contains(query.generated)) {
+            // Reported but KEPT. A later build may know this generator, and
+            // dropping the row here would delete it from the file on the next
+            // save, which is the same data loss the unknown-field handling
+            // exists to prevent.
+            addProblem(QStringLiteral("Saved query '%1' uses an unknown "
+                                      "generator '%2' and will find nothing.")
+                           .arg(query.name, query.generated));
+        }
 
         if (query.name.isEmpty()) {
             addProblem(QStringLiteral("A saved query in %1 has no name and was "
@@ -526,7 +571,8 @@ void Config::loadSavedQueries(const QString &configPath, QSettings &settings)
         for (auto it = object.begin(); it != object.end(); ++it) {
             static const QStringList known = {
                 QStringLiteral("name"), QStringLiteral("query"),
-                QStringLiteral("pinned"), QStringLiteral("account")
+                QStringLiteral("pinned"), QStringLiteral("account"),
+                QStringLiteral("generated"), QStringLiteral("flat")
             };
             if (!known.contains(it.key()))
                 query.unknown.insert(it.key(), it.value());
@@ -550,6 +596,10 @@ bool Config::saveSavedQueries() const
             object.insert(QStringLiteral("pinned"), true);
         if (!query.account.isEmpty())
             object.insert(QStringLiteral("account"), query.account);
+        if (query.isGenerated())
+            object.insert(QStringLiteral("generated"), query.generated);
+        if (query.flat)
+            object.insert(QStringLiteral("flat"), true);
         for (auto it = query.unknown.begin(); it != query.unknown.end(); ++it)
             object.insert(it.key(), it.value());
         array.append(object);
@@ -572,6 +622,18 @@ bool Config::saveSavedQueries() const
 
 QString Config::resolvedQuery(const SavedQuery &query) const
 {
+    // Composed from the accounts every time it is asked for, which is the
+    // point: the answer follows the config rather than a copy of it taken when
+    // the entry was written.
+    if (query.isGenerated()) {
+        if (query.generated == QStringLiteral("sent"))
+            return allSentQuery();
+        // An unknown generator was reported on load. Empty rather than the
+        // bare stored query, which for a generated entry is empty anyway and
+        // would otherwise run as "match everything".
+        return QString();
+    }
+
     if (query.account.isEmpty())
         return query.query;
 
diff --git a/src/config.h b/src/config.h
index 4211b0c..b9ee9d6 100644
--- a/src/config.h
+++ b/src/config.h
@@ -122,6 +122,27 @@ struct SavedQuery
     /// user edits it. Resolve through Config::resolvedQuery().
     QString account;
 
+    /// Names a builtin that COMPOSES this query from the accounts at run time,
+    /// rather than storing it. Empty for an ordinary query.
+    ///
+    /// "sent" is the only one today. Its query is built from every account's
+    /// `sent` key, so adding an account or correcting a folder name is a config
+    /// edit and nothing else; a stored copy of the same string would go stale
+    /// silently. That property is why Sent used to be hardcoded beside the
+    /// saved queries instead of living with them, which left one button on the
+    /// row that could not be reordered, renamed, unpinned or removed.
+    ///
+    /// Storing the GENERATOR rather than its output keeps both: the query stays
+    /// live, and the entry is an ordinary row the user owns.
+    QString generated;
+
+    /// Lists messages rather than threads. Set for the sent view, where a
+    /// thread would fold every reply back into the conversation the user sent
+    /// one message into.
+    bool flat = false;
+
+    bool isGenerated() const { return !generated.isEmpty(); }
+
     /// Keys this build does not understand, preserved verbatim so a file
     /// written by a later version survives a save from this one.
     QJsonObject unknown;
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index f06b308..62f4751 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1673,40 +1673,34 @@ void MainWindow::buildSavedQueryRow(QWidget *parent, QVBoxLayout *layout)
     auto *box = new QHBoxLayout(row);
     box->setContentsMargins(0, 0, 0, 0);
 
+    // Sent is an ordinary row here, not a hardcoded button beside the others.
+    // It is still GENERATED, so its query is composed from the accounts' `sent`
+    // keys at click time and correcting a folder name stays a config edit and
+    // nothing else; what changed is that the entry can now be reordered,
+    // renamed, unpinned or removed like every other, instead of being the one
+    // control on the row the user did not own.
     QList<SavedQuery> unpinned;
     for (const SavedQuery &saved : m_config.savedQueries()) {
+        // A generator whose accounts configure nothing produces a button that
+        // always finds nothing. Skipped entirely, which is what the hardcoded
+        // Sent button did and is worth keeping.
+        if (saved.isGenerated() && m_config.resolvedQuery(saved).isEmpty())
+            continue;
+
         if (!saved.pinned) {
             unpinned.append(saved);
             continue;
         }
         auto *button = new QPushButton(saved.name, row);
+        // The generated entries keep a stable object name so a test can find
+        // the sent button without depending on what the user renamed it to.
+        if (saved.generated == QStringLiteral("sent"))
+            button->setObjectName(QStringLiteral("sentButton"));
         connect(button, &QPushButton::clicked, this,
                 [this, saved]() { runSavedQuery(saved); });
         box->addWidget(button);
     }
 
-    // Sent sits with the saved queries and is not one: its query is COMPOSED
-    // from the accounts' `sent` keys at click time, so adding an account or
-    // correcting a folder name is a config edit and nothing else. A stored
-    // entry holding the same string would go stale silently, and could not
-    // narrow to the selected account the way this does through
-    // runCurrentQuery()'s existing scope wrap.
-    //
-    // Hidden entirely when no account configures a sent folder, rather than
-    // offering a button that always finds nothing.
-    if (!m_config.allSentQuery().isEmpty()) {
-        auto *sentButton = new QPushButton(tr("Sent"), row);
-        sentButton->setObjectName(QStringLiteral("sentButton"));
-        connect(sentButton, &QPushButton::clicked, this, [this]() {
-            m_queryEdit->setText(m_config.allSentQuery());
-            // Flat for this query only. runCurrentQuery() clears it again for
-            // anything else, including the same query typed by hand, so the
-            // flag cannot outlive the button that set it.
-            runQuery(FlatResult::Yes);
-        });
-        box->addWidget(sentButton);
-    }
-
     // Everything above is left-aligned; the stretch here pushes what follows
     // to the right edge. The buttons are the row's content and read as a set,
     // while the overflow menu is a control over that set, so it sits apart
@@ -1751,8 +1745,16 @@ void MainWindow::runSavedQuery(const SavedQuery &saved)
     if (index >= 0)
         m_accountBox->setCurrentIndex(index);
 
-    m_queryEdit->setText(saved.query);
-    runCurrentQuery();
+    // A generated entry has no stored query: the text is composed from the
+    // accounts now, so what lands in the bar is what actually ran and the user
+    // can see and edit it.
+    m_queryEdit->setText(saved.isGenerated() ? m_config.resolvedQuery(saved)
+                                             : saved.query);
+
+    // Flat for this query only. runQuery() sets the mode on EVERY run, so the
+    // flag cannot outlive the entry that asked for it, including for the same
+    // query typed by hand afterwards.
+    runQuery(saved.flat ? FlatResult::Yes : FlatResult::No);
 }
 
 void MainWindow::saveCurrentQuery()
diff --git a/tests/test_config.cpp b/tests/test_config.cpp
index 8024728..dfe463b 100644
--- a/tests/test_config.cpp
+++ b/tests/test_config.cpp
@@ -62,6 +62,11 @@ private slots:
     void futureVersionIsRefusedAndReported();
     void startupQueryFallsBackToDocumentOrder();
     void scopedSavedQueryParenthesisesADisjunction();
+    void aGeneratedQueryResolvesFromTheAccounts();
+    void aGeneratedQueryTracksAConfigChange();
+    void anUnknownGeneratorResolvesToNothingAndReports();
+    void migrationAddsSentWhenAnAccountHasOne();
+    void migrationAddsNoSentWithoutTheKey();
     void generalSectionKeysAreActuallyRead();
     void messageZoomDefaultsAndValidates();
     void messageZoomOutOfRangeIsReported();
@@ -1416,5 +1421,156 @@ void TestConfig::scopedSavedQueryParenthesisesADisjunction()
     QCOMPARE(config.resolvedQuery(orphan), QStringLiteral("tag:inbox"));
 }
 
+// ---------------------------------------------------------------------------
+// Generated saved queries
+// ---------------------------------------------------------------------------
+
+static QString twoAccountsWithSent()
+{
+    return QStringLiteral(
+        "[account.work]\n"
+        "name=Test User\n"
+        "address=user@example.org\n"
+        "maildir=work-mail\n"
+        "sent=Sent\n"
+        "\n"
+        "[account.personal]\n"
+        "name=Test User\n"
+        "address=me@example.net\n"
+        "maildir=personal\n"
+        "sent=[Provider]/Posta inviata\n"
+    );
+}
+
+void TestConfig::aGeneratedQueryResolvesFromTheAccounts()
+{
+    QTemporaryDir dir;
+    const QString path = writeIni(dir, twoAccountsWithSent());
+    writeQueries(dir, QStringLiteral(R"({
+        "version": 1,
+        "queries": [
+            { "name": "Sent", "generated": "sent", "pinned": true }
+        ]
+    })"));
+
+    Config config;
+    config.load(path);
+
+    const SavedQuery sent = config.savedQueries().at(0);
+    QVERIFY(sent.isGenerated());
+    // The stored query is empty; the text comes from the accounts.
+    QVERIFY(sent.query.isEmpty());
+    QCOMPARE(config.resolvedQuery(sent), config.allSentQuery());
+    QVERIFY(config.resolvedQuery(sent).contains(
+        QStringLiteral("path:\"work-mail/Sent/**\"")));
+    // The quotes matter: "[" and "]" are Xapian syntax and an unquoted term
+    // is parsed rather than matched.
+    QVERIFY(config.resolvedQuery(sent).contains(
+        QStringLiteral("path:\"personal/[Provider]/Posta inviata/**\"")));
+
+    // Flat, not threaded: a sent view lists messages, and that property has to
+    // travel with the entry or it is lost the moment Sent is a stored row.
+    QVERIFY(sent.flat);
+}
+
+/// The whole reason Sent is generated rather than stored. A stored copy would
+/// keep naming an account that has been renamed or a folder that has moved.
+void TestConfig::aGeneratedQueryTracksAConfigChange()
+{
+    QTemporaryDir dir;
+    const QString queries = QStringLiteral(R"({
+        "version": 1,
+        "queries": [ { "name": "Sent", "generated": "sent" } ]
+    })");
+
+    const QString before = writeIni(dir, twoAccountsWithSent());
+    writeQueries(dir, queries);
+    Config first;
+    first.load(before);
+    const QString firstResolved = first.resolvedQuery(first.savedQueries().at(0));
+
+    // The user corrects a folder name. Nothing in queries.json changes.
+    QTemporaryDir second;
+    const QString after = writeIni(second, QStringLiteral(
+        "[account.work]\n"
+        "name=Test User\n"
+        "address=user@example.org\n"
+        "maildir=work-mail\n"
+        "sent=Sent Items\n"
+    ));
+    writeQueries(second, queries);
+    Config later;
+    later.load(after);
+    const QString laterResolved = later.resolvedQuery(later.savedQueries().at(0));
+
+    QVERIFY(firstResolved != laterResolved);
+    QVERIFY(laterResolved.contains(QStringLiteral("Sent Items")));
+}
+
+void TestConfig::anUnknownGeneratorResolvesToNothingAndReports()
+{
+    QTemporaryDir dir;
+    const QString path = writeIni(dir, twoAccountsWithSent());
+    writeQueries(dir, QStringLiteral(R"({
+        "version": 1,
+        "queries": [ { "name": "Future", "generated": "not_a_generator" } ]
+    })"));
+
+    Config config;
+    config.load(path);
+
+    // Kept rather than dropped: a later build may know this generator, and
+    // silently deleting the row on save would lose it.
+    QCOMPARE(config.savedQueries().size(), 1);
+    QVERIFY(config.resolvedQuery(config.savedQueries().at(0)).isEmpty());
+    QVERIFY2(!config.problems().isEmpty(),
+             "an unknown generator must be reported, not silently inert");
+}
+
+void TestConfig::migrationAddsSentWhenAnAccountHasOne()
+{
+    QTemporaryDir dir;
+    const QString path = writeIni(dir, twoAccountsWithSent()
+                                       + QStringLiteral(
+        "\n[queries]\n"
+        "Inbox=tag:inbox\n"
+    ));
+
+    Config config;
+    config.load(path);
+
+    const QList<SavedQuery> queries = config.savedQueries();
+    QCOMPARE(queries.size(), 2);
+    // Last, where the button already sat: after the saved queries.
+    QCOMPARE(queries.at(1).name, QStringLiteral("Sent"));
+    QVERIFY(queries.at(1).isGenerated());
+    QVERIFY(queries.at(1).pinned);
+    QVERIFY(queries.at(1).flat);
+}
+
+/// Today the button is hidden entirely when no account configures a sent
+/// folder, rather than offering one that always finds nothing. The migration
+/// must not invent a row that would do exactly that.
+void TestConfig::migrationAddsNoSentWithoutTheKey()
+{
+    QTemporaryDir dir;
+    const QString path = writeIni(dir, QStringLiteral(
+        "[account.work]\n"
+        "name=Test User\n"
+        "address=user@example.org\n"
+        "maildir=work-mail\n"
+        "\n"
+        "[queries]\n"
+        "Inbox=tag:inbox\n"
+    ));
+
+    Config config;
+    config.load(path);
+
+    const QList<SavedQuery> queries = config.savedQueries();
+    QCOMPARE(queries.size(), 1);
+    QCOMPARE(queries.at(0).name, QStringLiteral("Inbox"));
+}
+
 QTEST_MAIN(TestConfig)
 #include "test_config.moc"
diff --git a/tests/test_mainwindow.cpp b/tests/test_mainwindow.cpp
index 42d7d78..883e9a7 100644
--- a/tests/test_mainwindow.cpp
+++ b/tests/test_mainwindow.cpp
@@ -200,6 +200,9 @@ private slots:
     void thereIsASaveButtonBesideTheQueryBar();
     void theMenuIsRightAlignedAwayFromTheButtons();
     void theRowSurvivesWithNothingButUnpinnedQueries();
+    void aStoredGeneratedQueryRunsFlatAndComposed();
+    void aRenamedSentEntryKeepsWorking();
+    void aGeneratedQueryWithNothingToShowIsSkipped();
 
 private:
     /// Owns the throwaway lock table init() points every test at. A pointer
@@ -5664,4 +5667,112 @@ void TestMainWindow::theRowSurvivesWithNothingButUnpinnedQueries()
     QCOMPARE(menuButton->menu()->actions().size(), 2);
 }
 
+static QString oneAccountWithSent()
+{
+    return QStringLiteral(
+        "[account.work]\n"
+        "name=Test User\n"
+        "address=user@example.org\n"
+        "maildir=work-mail\n"
+        "sent=Sent\n"
+    );
+}
+
+/// The existing Sent tests reach the generated entry through MIGRATION, since
+/// their configs have no queries.json. This one starts from a stored file, so
+/// it covers the path a user is on from the second launch onwards.
+void TestMainWindow::aStoredGeneratedQueryRunsFlatAndComposed()
+{
+    QTemporaryDir dir;
+    QVERIFY(dir.isValid());
+    Config config;
+    loadWithQueries(config, dir, QStringLiteral(R"({
+        "version": 1,
+        "queries": [
+            { "name": "Sent", "generated": "sent", "pinned": true }
+        ]
+    })"), oneAccountWithSent());
+
+    MainWindow window(config);
+    auto *button =
+        window.findChild<QPushButton *>(QStringLiteral("sentButton"));
+    QVERIFY(button);
+
+    auto *queryEdit =
+        window.findChild<QLineEdit *>(QStringLiteral("queryEdit"));
+    QVERIFY(queryEdit);
+    auto *model = window.findChild<ThreadListModel *>();
+    QVERIFY(model);
+    QVERIFY2(!model->flatMode(), "the model starts threaded");
+
+    button->click();
+
+    // Composed from the account, not read from the file: the entry stores no
+    // query at all.
+    QCOMPARE(queryEdit->text(), config.allSentQuery());
+    QVERIFY(queryEdit->text().contains(
+        QStringLiteral("path:\"work-mail/Sent/**\"")));
+    QVERIFY2(model->flatMode(),
+             "a sent view must be flat, or replies fold back into the thread");
+}
+
+/// The point of the change: Sent is the user's row now. Renaming it must not
+/// break it, which it would if anything keyed on the literal name "Sent".
+void TestMainWindow::aRenamedSentEntryKeepsWorking()
+{
+    QTemporaryDir dir;
+    QVERIFY(dir.isValid());
+    Config config;
+    loadWithQueries(config, dir, QStringLiteral(R"({
+        "version": 1,
+        "queries": [
+            { "name": "Posta inviata", "generated": "sent", "pinned": true }
+        ]
+    })"), oneAccountWithSent());
+
+    MainWindow window(config);
+    const QStringList labels = savedQueryButtonLabels(window);
+    QCOMPARE(labels, QStringList{ QStringLiteral("Posta inviata") });
+
+    auto *button =
+        window.findChild<QPushButton *>(QStringLiteral("sentButton"));
+    QVERIFY2(button, "the generated entry lost its identity when renamed");
+
+    auto *queryEdit =
+        window.findChild<QLineEdit *>(QStringLiteral("queryEdit"));
+    button->click();
+    QCOMPARE(queryEdit->text(), config.allSentQuery());
+}
+
+/// The hardcoded button was hidden entirely when no account configured a sent
+/// folder, rather than offering one that always finds nothing. A stored row
+/// must behave the same way.
+void TestMainWindow::aGeneratedQueryWithNothingToShowIsSkipped()
+{
+    QTemporaryDir dir;
+    QVERIFY(dir.isValid());
+    Config config;
+    loadWithQueries(config, dir, QStringLiteral(R"({
+        "version": 1,
+        "queries": [
+            { "name": "Inbox", "query": "tag:inbox", "pinned": true },
+            { "name": "Sent", "generated": "sent", "pinned": true }
+        ]
+    })"), QStringLiteral(
+        "[account.work]\n"
+        "name=Test User\n"
+        "address=user@example.org\n"
+        "maildir=work-mail\n"
+    ));
+
+    MainWindow window(config);
+
+    // The guard: the row was built and the other entry did get a button, so a
+    // missing Sent means it was skipped rather than that nothing was built.
+    QCOMPARE(savedQueryButtonLabels(window),
+             QStringList{ QStringLiteral("Inbox") });
+    QVERIFY2(!window.findChild<QPushButton *>(QStringLiteral("sentButton")),
+             "a generated query with nothing to show must not get a button");
+}
+
 #include "test_mainwindow.moc"