diff --git a/smtp-send-note.py b/smtp-send-note.py
index c08f502..0760857 100755
--- a/smtp-send-note.py
+++ b/smtp-send-note.py
@@ -15,11 +15,11 @@ def get_config(fname):
 
 def main(argv):
     config = {}
-    if len(argv) != 3:
+    if len(argv) < 3:
         sys.stderr.write('Usage: %s <config-file> <note>\n' % argv[0])
         return 1
     config = get_config(argv[1])
-    message = argv[2]
+    message = ' '.join(argv[2:])
     if not ('server' in config and 'port' in config and 'user' in config
             and 'password' in config and 'to_addr' in config
             and 'from_addr' in config):