diff --git a/ChangeLog b/ChangeLog
index c59abdc92d8fb9c4150d3acb4ce6048aa7239d40..9a36dc4264a2a3e5dfa1ae461a02fed69c5d4174 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -57,6 +57,9 @@ CVS code -
   justify_format(), do_justify()
         - Various fixes for starting blank spaces, spaces after
           punctuation, & segfault with quoting strings (David Benbennick).
+  do_justify()
+	- Don't continue to justify string if it's indented more 
+	  (quoting wise) than the beginning of the justification.
   help_init()
 	- Added message re: having multiple blank buffers (DLR).
   main()
diff --git a/nano.c b/nano.c
index 5e50e4c72a1d18e5098b2dcb60aa464885ce274e..bffdc5c48345be05fc4749a568635ce33b4c6273 100644
--- a/nano.c
+++ b/nano.c
@@ -2307,6 +2307,9 @@ int do_justify(void)
     /* Put the whole paragraph into one big line. */
     while (current->next && !isspace((int) current->next->data[0])
 	   && !strncmp(current->next->data, samecheck->data, qdepth)
+
+	   /* Don't continue if current->next is indented more! */
+	   && strncmp(&current->next->data[qdepth], quotestr, strlen(quotestr))
 	   && !empty_line(&current->next->data[qdepth])) {
 	filestruct *tmpnode = current->next;
 	int len = strlen(current->data);