diff --git a/etherpump/commands/pull.py b/etherpump/commands/pull.py
index 3948089..3f98fc5 100644
--- a/etherpump/commands/pull.py
+++ b/etherpump/commands/pull.py
@@ -374,7 +374,7 @@ async def handle_pad(args, padid, data, info, session):
             ##########################################
             # INCLUDE __XXX__ MAGIC WORDS
             ##########################################
-            if args.magicwords:
+            if args.all or args.magicwords:
                 pattern = r"__[a-zA-Z0-9]+?__"
                 all_matches = re.findall(pattern, text)
                 magic_words = list(set(all_matches))