diff --git a/app/views/integrations/index.html.erb b/app/views/integrations/index.html.erb
index d200b12c..be2a5a0c 100644
--- a/app/views/integrations/index.html.erb
+++ b/app/views/integrations/index.html.erb
@@ -12,6 +12,18 @@
 <p>Do you have one of your own to add? <a href="http://www.rousette.org.uk/projects/forums/viewforum/10/" title="Tracks | Tips and Tricks">Tell us about it in our Tips and Tricks forum
 </a> and we may include it on this page in a future versions of Tracks.</p>
 
+<a name="message_gateway"> </a>
+<h2>Integrated email/SMS receiver</h2>
+<p>
+If Tracks is running on the same server as your mail server, you can use the integrated mail handler built into tracks. Steps to set it up:
+<ul>
+  <li>Go to <%= link_to "Preferences", preferences_url %> and set your "From email" and "default email context" for todos sent in via email (which could come from an SMS message)</li>
+  <li>In sendmail/qmail/postfix/whatever, set up an email address alias to pipe messages to <pre style="font-size:1.5em">/PATH/TO/RUBY/ruby /PATH/TO/TRACKS/script/runner -e production 'MessageGateway.receive(STDIN.read)'</pre></li>
+  <li>Send an email to your newly configured address!</li>
+</ul>
+You can also use the Rich Todo API to send in tasks like "do laundry @ Home" or "Call Bill > project X". The subject of the message will fill description, context, and project, while the body will populate the tasks's note.
+</p>
+
 <a name="applescript1-section"> </a>
 <h2>Add an Action with Applescript</h2>
 <p>This is a simple script that pops up a dialog box asking for a description, and then sends that to Tracks with a hard-coded context.</p>
diff --git a/app/views/preferences/edit.html.erb b/app/views/preferences/edit.html.erb
index 796cd8ce..4b1c3b5f 100644
--- a/app/views/preferences/edit.html.erb
+++ b/app/views/preferences/edit.html.erb
@@ -20,7 +20,7 @@
       <li><strong>verbose action descriptor:</strong> when true, show project/context name in action listing; when false show [P]/[C] with tool tips</li>
       <li><strong>mobile todos per page:</strong> the maximum number of actions to show on a single page in the mobile view</li>
       <li><strong>From email:</string> the email address you use for sending todos as email or SMS messages to your Tracks account</li>
-      <li><string>Message context:</string> the context to which tasks sent in via email or SMS should be added</li>
+      <li><string>Default email context:</string> the context to which tasks sent in via email or SMS should be added</li>
     </ul>
 </div>
 
diff --git a/app/views/preferences/index.html.erb b/app/views/preferences/index.html.erb
index 81b0edf0..05c90a86 100644
--- a/app/views/preferences/index.html.erb
+++ b/app/views/preferences/index.html.erb
@@ -29,7 +29,7 @@
     <li>Verbose action descriptors: <span class="highlight"><%= prefs.verbose_action_descriptors %></span></li>
     <li>Actions per page (Mobile View): <span class="highlight"><%= prefs.mobile_todos_per_page %></span></li>
     <li>From email: <span class="highlight"><%= prefs.sms_email %></span></li>
-    <li>Message context: <span class="highlight"><%= prefs.sms_context.nil? ? "None" : prefs.sms_context.name  %></span></li>
+    <li>Default email context: <span class="highlight"><%= prefs.sms_context.nil? ? "None" : prefs.sms_context.name  %></span></li>
   </ul>
   <div class="actions">
     <%= link_to "Edit preferences &raquo;", { :controller => 'preferences', :action => 'edit'}, :class => 'edit_link' %>