diff --git a/templates/zerver/compare.html b/templates/zerver/compare.html
index 6f0fa1cd4a..a324ff4dc5 100644
--- a/templates/zerver/compare.html
+++ b/templates/zerver/compare.html
@@ -70,16 +70,16 @@
                     <td>Free and open source</td>
                     <td class="yes"></td>
                     <td class="no"></td>
-                    <td>See below*</td>
+                    <td>Open Core *</td>
                     <td class="no"></td>
                 </tr>
             </tbody>
         </table>
         <p class="terms">
             <span class="term">
-                * On Mattermost's licensing: Mattermost Team is open source,
-                but most enterprise-grade features are in Mattermost
-                Enterprise, which is not.
+                * Mattermost Team is open source, but many features
+                are only available in their proprietary version,
+                Mattermost Enterprise.
             </span>
         </p>
     </div>
diff --git a/templates/zerver/faq.html b/templates/zerver/faq.html
index 9c4c5bc285..d51067557c 100644
--- a/templates/zerver/faq.html
+++ b/templates/zerver/faq.html
@@ -12,12 +12,15 @@
                 </div>
                 <p class="answer">
                     Yes! Zulip Cloud Standard is free for open source
-                    projects and affiliated institutions. We also offer
-                    steep discounts to non-profits, educational
-                    institutions, groups of friends, and in scenarios where
-                    most of the users are not paid employees (e.g. company
-                    support forums). Just contact sales@zulipchat.com and
-                    we&rsquo;d be happy to discuss your situation!
+                    projects.  We also offer steep discounts (usually
+                    85%-100%) to many non-profits, educational
+                    institutions, groups of friends, and in other
+                    scenarios where most of the users are not fulltime
+                    employees of the customer. Generally, only closed
+                    organizations that also pay their members'
+                    salaries pay full price.  Just contact
+                    sales@zulipchat.com and we&rsquo;d be happy to
+                    discuss your situation!
                 </p>
                 <p class="answer">
                     You may also be interested in
@@ -77,6 +80,19 @@
                     are available <a href="/help/roles-and-permissions">here</a>.
                 </p>
             </div>
+            <div class="faq">
+                <div class="question">
+                    How does the free plan message limit work?
+                </div>
+                <p class="answer">
+                    Only the most recent 10,000 messages can be viewed
+                    and searched with Zulip Free.  Older messages are
+                    still stored and will become available again
+                    should the organization purchase a paid plan or
+                    get Zulip Cloud Standard free because they are an
+                    open source project or similar organization.
+                </p>
+            </div>
             <div class="faq">
                 <div class="question">
                     Who can I contact if I have further questions?