diff --git a/docs/conf.py b/docs/conf.py
index 4b039e6..1ed33fb 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@ copyright = u'2013, Adam Coddington'
 # built documents.
 #
 # The short X.Y version.
-version = '2.1'
+version = '3.0'
 # The full version, including alpha/beta/rc tags.
-release = '2.1'
+release = '3.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/topics/message-storage.rst b/docs/topics/message-storage.rst
index 7f96b9c..e232a53 100644
--- a/docs/topics/message-storage.rst
+++ b/docs/topics/message-storage.rst
@@ -81,6 +81,10 @@ Although in this constructed example, this reduces the message's size only
 marginally, in most instances, attached files are much larger than the
 attachment shown here.
 
+.. note::
+
+   Email message bodies are ``base-64`` encoded when stored in the database.
+
 Although the attachment is no longer preserved in the message body above,
 and only the ``X-Django-Mailbox-Interpolate-Attachment: 1308`` header remains
 in the place of the original attachment, the attachment was stored in a